- Patch #490074 by andypost, bjaspan, catch: fix upgrade path from Drupal 6 to Drupal 7.

3 files changed, 20 insertions, 17 deletions

diff --git a/modules/node/node.install b/modules/node/node.install
index 72c82481a..d81626f52 100644
--- a/modules/node/node.install
+++ b/modules/node/node.install
@@ -398,7 +398,7 @@ function node_update_7004() {
 
   // Map old preview setting to new values order.
   $original_preview ? $original_preview = 2 : $original_preview = 1;
-  $node_types_clear();
+  node_type_clear();
   $type_list = node_type_get_types();
 
   // Apply original settings to all types.
diff --git a/modules/system/system.install b/modules/system/system.install
index fd383c765..eff039e88 100644
--- a/modules/system/system.install
+++ b/modules/system/system.install
@@ -3554,12 +3554,31 @@ function system_update_7026() {
 function system_update_7027() {
   $ret = array();
   $module_list = array('text', 'number', 'list', 'options');
+  db_delete('system')->condition('type', 'module')->condition('name', $module_list)->execute();
   drupal_install_modules($module_list);
   module_enable($module_list);
   return $ret;
 }
 
 /**
+ * Rename taxonomy tables.
+ */
+function system_update_7028() {
+  $ret = array();
+  db_rename_table($ret, 'term_data', 'taxonomy_term_data');
+  db_rename_table($ret, 'term_hierarchy', 'taxonomy_term_hierarchy');
+  db_rename_table($ret, 'term_node', 'taxonomy_term_node');
+  db_rename_table($ret, 'term_relation', 'taxonomy_term_relation');
+  db_rename_table($ret, 'term_synonym', 'taxonomy_term_synonym');
+  db_rename_table($ret, 'vocabulary', 'taxonomy_vocabulary');
+  db_rename_table($ret, 'vocabulary_node_types', 'taxonomy_vocabulary_node_type');
+
+  return $ret;
+}
+
+
+
+/**
  * @} End of "defgroup updates-6.x-to-7.x"
  * The next series of updates should start at 8000.
  */
diff --git a/modules/taxonomy/taxonomy.install b/modules/taxonomy/taxonomy.install
index e43bb0e91..40b1be298 100644
--- a/modules/taxonomy/taxonomy.install
+++ b/modules/taxonomy/taxonomy.install
@@ -338,22 +338,6 @@ function taxonomy_schema() {
 }
 
 /**
- * Rename taxonomy tables.
- */
-function taxonomy_update_7001() {
-  $ret = array();
-  db_rename_table($ret, 'term_data', 'taxonomy_term_data');
-  db_rename_table($ret, 'term_hierarchy', 'taxonomy_term_hierarchy');
-  db_rename_table($ret, 'term_node', 'taxonomy_term_node');
-  db_rename_table($ret, 'term_relation', 'taxonomy_term_relation');
-  db_rename_table($ret, 'term_synonym', 'taxonomy_term_synonym');
-  db_rename_table($ret, 'vocabulary', 'taxonomy_vocabulary');
-  db_rename_table($ret, 'vocabulary_node_types', 'taxonomy_vocabulary_node_type');
-
-  return $ret;
-}
-
-/**
  * Add vocabulary machine_name column.
  */
 function taxonomy_update_7002() {