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

#330983 follow-up by David Rothenstein: Move rename function later in the process to un-break D6->D7 upgrade path.

merge-requests/26/head
Angie Byron 2009-02-20 07:14:42 +00:00
parent 08616351e1
commit 09644fd0a9
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
update.php
View File

@ -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