diff options
author | Dries Buytaert <dries@buytaert.net> | 2010-05-04 15:25:42 +0000 |
---|---|---|
committer | Dries Buytaert <dries@buytaert.net> | 2010-05-04 15:25:42 +0000 |
commit | 97b7f029cee6415d43ff8e9505ed4cda408f490b (patch) | |
tree | 2c7dae51fd17150c4196e6a2ae86540bf5f0fa03 /update.php | |
parent | 445d7142c40cdd71032f5d8ce008065c267f3abb (diff) | |
download | drupal-97b7f029cee6415d43ff8e9505ed4cda408f490b.tar.gz drupal-97b7f029cee6415d43ff8e9505ed4cda408f490b.zip |
- Patch #789464 by pwolanin: update.php has a fatal error if any module extends a core stream wrapper class.
Diffstat (limited to 'update.php')
-rw-r--r-- | update.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/update.php b/update.php index 1f58322d16c..bd31d1eab4e 100644 --- a/update.php +++ b/update.php @@ -333,6 +333,7 @@ ini_set('display_errors', FALSE); require_once DRUPAL_ROOT . '/includes/bootstrap.inc'; require_once DRUPAL_ROOT . '/includes/update.inc'; require_once DRUPAL_ROOT . '/includes/common.inc'; +require_once DRUPAL_ROOT . '/includes/file.inc'; require_once DRUPAL_ROOT . '/includes/entity.inc'; require_once DRUPAL_ROOT . '/includes/unicode.inc'; update_prepare_d7_bootstrap(); @@ -346,7 +347,6 @@ drupal_bootstrap(DRUPAL_BOOTSTRAP_SESSION); $op = isset($_REQUEST['op']) ? $_REQUEST['op'] : ''; if (empty($op) && update_access_allowed()) { require_once DRUPAL_ROOT . '/includes/install.inc'; - require_once DRUPAL_ROOT . '/includes/file.inc'; require_once DRUPAL_ROOT . '/modules/system/system.install'; // Load module basics. |