Commit e42450e4 authored by Dries's avatar Dries
Browse files

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

parent 19302728
...@@ -398,7 +398,7 @@ function node_update_7004() { ...@@ -398,7 +398,7 @@ function node_update_7004() {
// Map old preview setting to new values order. // Map old preview setting to new values order.
$original_preview ? $original_preview = 2 : $original_preview = 1; $original_preview ? $original_preview = 2 : $original_preview = 1;
$node_types_clear(); node_type_clear();
$type_list = node_type_get_types(); $type_list = node_type_get_types();
// Apply original settings to all types. // Apply original settings to all types.
......
...@@ -3554,11 +3554,30 @@ function system_update_7026() { ...@@ -3554,11 +3554,30 @@ function system_update_7026() {
function system_update_7027() { function system_update_7027() {
$ret = array(); $ret = array();
$module_list = array('text', 'number', 'list', 'options'); $module_list = array('text', 'number', 'list', 'options');
db_delete('system')->condition('type', 'module')->condition('name', $module_list)->execute();
drupal_install_modules($module_list); drupal_install_modules($module_list);
module_enable($module_list); module_enable($module_list);
return $ret; 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" * @} End of "defgroup updates-6.x-to-7.x"
* The next series of updates should start at 8000. * The next series of updates should start at 8000.
......
...@@ -337,22 +337,6 @@ function taxonomy_schema() { ...@@ -337,22 +337,6 @@ function taxonomy_schema() {
return $schema; return $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. * Add vocabulary machine_name column.
*/ */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment