From 09644fd0a9f845d3ce22cd1c8487d01b8f7b71df Mon Sep 17 00:00:00 2001 From: Angie Byron Date: Fri, 20 Feb 2009 07:14:42 +0000 Subject: #330983 follow-up by David Rothenstein: Move rename function later in the process to un-break D6->D7 upgrade path. --- update.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'update.php') diff --git a/update.php b/update.php index 32b98ec98..15e8bafa4 100644 --- a/update.php +++ b/update.php @@ -588,12 +588,11 @@ function update_prepare_d7_bootstrap() { // Allow the database system to work even though the registry has not // been created yet. drupal_bootstrap(DRUPAL_BOOTSTRAP_DATABASE); - update_prepare_d7_bootstrap_rename(); - include_once DRUPAL_ROOT . '/includes/install.inc'; drupal_install_init_database(); spl_autoload_unregister('drupal_autoload_class'); spl_autoload_unregister('drupal_autoload_interface'); + update_prepare_d7_bootstrap_rename(); // The new {blocked_ips} table is used in Drupal 7 to store a list of // banned IP addresses. If this table doesn't exist then we are still // running on a Drupal 6 database, so suppress the unavoidable errors -- cgit v1.2.3