Index: update.php =================================================================== RCS file: /cvs/drupal/drupal/update.php,v retrieving revision 1.282 diff -u -p -r1.282 update.php --- update.php 12 May 2009 08:37:44 -0000 1.282 +++ update.php 16 May 2009 20:04:42 -0000 @@ -635,6 +635,8 @@ function update_prepare_d7_bootstrap() { * made which make it impossible to continue using the prior version. */ function update_fix_d7_requirements() { + $ret = array(); + // Rewrite the settings.php file if necessary. // @see update_prepare_d7_bootstrap(). global $update_rewrite_settings, $db_url; @@ -642,6 +644,15 @@ function update_fix_d7_requirements() { $databases = update_parse_db_url($db_url); 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; } /** Index: modules/system/system.install =================================================================== RCS file: /cvs/drupal/drupal/modules/system/system.install,v retrieving revision 1.326 diff -u -p -r1.326 system.install --- modules/system/system.install 16 May 2009 19:07:02 -0000 1.326 +++ modules/system/system.install 16 May 2009 20:04:45 -0000 @@ -3498,17 +3498,6 @@ function system_update_7023() { } /** - * 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" * The next series of updates should start at 8000. */ ? sites/all/modules/pqp/d7.patch