Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

#456824 follow-up by catch: Fix D6 -> D7 upgrade path failure.

merge-requests/26/head
Angie Byron 2009-05-16 20:25:20 +00:00
parent b62fb8299f
commit ba61b42bd9
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
modules/system/system.install
View File

@ -3497,17 +3497,6 @@ function system_update_7023() {
return $ret; return $ret;
} }
/**
* Create the cache_path table.
*/
function system_update_7024() {
$ret = array();
$schema['cache_path'] = drupal_get_schema_unprocessed('system', 'cache');
$schema['cache_path']['description'] = t('Cache table used for path alias lookups.');
db_create_table($ret, 'cache_path', $schema['cache_path']);
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.

12
update.php
View File

@ -635,6 +635,8 @@ function update_prepare_d7_bootstrap() {
* made which make it impossible to continue using the prior version. * made which make it impossible to continue using the prior version.
*/ */
function update_fix_d7_requirements() { function update_fix_d7_requirements() {
$ret = array();
// Rewrite the settings.php file if necessary. // Rewrite the settings.php file if necessary.
// @see update_prepare_d7_bootstrap(). // @see update_prepare_d7_bootstrap().
global $update_rewrite_settings, $db_url; global $update_rewrite_settings, $db_url;
@ -642,6 +644,16 @@ function update_fix_d7_requirements() {
$databases = update_parse_db_url($db_url); $databases = update_parse_db_url($db_url);
file_put_contents(conf_path() . '/settings.php', "\n" . '$databases = ' . var_export($databases, TRUE) . ';', FILE_APPEND); file_put_contents(conf_path() . '/settings.php', "\n" . '$databases = ' . var_export($databases, TRUE) . ';', FILE_APPEND);
} }
if (drupal_get_installed_schema_version('system') < 7000 && !variable_get('update_d7_requirements', FALSE)) {
// Add the cache_path table.
$schema['cache_path'] = drupal_get_schema_unprocessed('system', 'cache');
$schema['cache_path']['description'] = t('Cache table used for path alias lookups.');
db_create_table($ret, 'cache_path', $schema['cache_path']);
variable_set('update_d7_requirements', TRUE);
}
return $ret;
} }
/** /**