Fixed bug in setup/prepare step

tripal/includes/TripalEntityController.inc

@@ -331,7 +331,7 @@ class TripalEntityController extends EntityAPIController {
     }
     catch (Exception $e) {
       $transaction->rollback();
-      watchdog_exception('tripal_core', $e);
+      watchdog_exception('tripal', $e);
       drupal_set_message("Could not save the entity: " . $e->getMessage(), "error");
       return FALSE;
     }

tripal_chado/includes/setup/tripal_chado.setup.inc

@@ -140,6 +140,21 @@ function tripal_chado_prepare_chado() {
     // We want to force the version of Chado to be set properly.
     $real_version = chado_get_version(TRUE);
 
+    // Create custom tables depending on the Chado version installed.
+    $chado_version = chado_get_version();
+    if ($chado_version == '1.1') {
+      tripal_chado_add_v1_1_custom_tables();
+      tripal_chado_add_vx_x_custom_tables();
+    }
+    if ($chado_version == '1.2') {
+      tripal_chado_add_v1_2_custom_tables();
+      tripal_chado_add_vx_x_custom_tables();
+    }
+    if ($chado_version == '1.3') {
+      tripal_chado_add_vx_x_custom_tables();
+      tripal_chado_fix_v1_3_custom_tables();
+    }
+
     // Import commonly used ontologies if needed.
     tripal_chado_load_ontologies();
 
@@ -295,21 +310,6 @@ function tripal_chado_prepare_chado() {
       }
     }
 
-    // Create custom tables depending on the Chado version installed.
-    $chado_version = chado_get_version();
-    if ($chado_version == '1.1') {
-      tripal_chado_add_v1_1_custom_tables();
-      tripal_chado_add_vx_x_custom_tables();
-    }
-    if ($chado_version == '1.2') {
-      tripal_chado_add_v1_2_custom_tables();
-      tripal_chado_add_vx_x_custom_tables();
-    }
-    if ($chado_version == '1.3') {
-      tripal_chado_add_vx_x_custom_tables();
-      tripal_chado_fix_v1_3_custom_tables();
-    }
-
     // Add the supported loaders
     variable_set('tripal_pub_supported_dbs', array('PMID', 'AGL'));
 

tripal_chado/includes/tripal_chado.install.inc

@@ -140,7 +140,7 @@ function tripal_chado_load_form_validate($form, &$form_state) {
       $form_state['values']['action_to_do'] == "Install Chado v1.11") {
 
     $modules = system_get_info('module');
-    // The tripal_chado_iews module should not be included as it's a required
+    // The tripal_chado_views module should not be included as it's a required
     // dependency of tripal_chado
     unset($modules['tripal_chado_views']);
     $list = array();