diff options
| author | Angie Byron <webchick@24967.no-reply.drupal.org> | 2009-02-20 07:14:42 +0000 |
|---|---|---|
| committer | Angie Byron <webchick@24967.no-reply.drupal.org> | 2009-02-20 07:14:42 +0000 |
| commit | 09644fd0a9f845d3ce22cd1c8487d01b8f7b71df (patch) | |
| tree | 07ba92c17f20f7d4cd5ef5ae0d0ffc8b36364d0a /update.php | |
| parent | 08616351e19d262b63377a475b5d4fb54f653897 (diff) | |
| download | brdo-09644fd0a9f845d3ce22cd1c8487d01b8f7b71df.tar.gz brdo-09644fd0a9f845d3ce22cd1c8487d01b8f7b71df.tar.bz2 | |
#330983 follow-up by David Rothenstein: Move rename function later in the process to un-break D6->D7 upgrade path.
Diffstat (limited to 'update.php')
| -rw-r--r-- | update.php | 3 |
1 files changed, 1 insertions, 2 deletions
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 |