diff options
| author | Dries Buytaert <dries@buytaert.net> | 2011-02-21 20:05:26 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2011-02-21 20:05:26 +0000 |
| commit | faa920f9e66a61bb1c8b79e585e3f5cd1cda16da (patch) | |
| tree | d8356cc7eddd0ed9201bc64b2c38c0d7d1fc7a27 /update.php | |
| parent | b20486762f496d3f5b3bd7b6148f80ffddb36fce (diff) | |
| download | brdo-faa920f9e66a61bb1c8b79e585e3f5cd1cda16da.tar.gz brdo-faa920f9e66a61bb1c8b79e585e3f5cd1cda16da.tar.bz2 | |
- Patch #1006838 by coltrane: upgrade to 7 glaring timezone invalid notice.
Diffstat (limited to 'update.php')
| -rw-r--r-- | update.php | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/update.php b/update.php index 4c81955fd..cea987f93 100644 --- a/update.php +++ b/update.php @@ -349,9 +349,18 @@ require_once DRUPAL_ROOT . '/includes/entity.inc'; require_once DRUPAL_ROOT . '/includes/unicode.inc'; update_prepare_d7_bootstrap(); +// Temporarily disable configurable timezones so the upgrade process uses the +// site-wide timezone. This prevents a PHP notice during session initlization +// and before offsets have been converted in user_update_7002(). +$configurable_timezones = variable_get('configurable_timezones', 1); +$conf['configurable_timezones'] = 0; + // Determine if the current user has access to run update.php. drupal_bootstrap(DRUPAL_BOOTSTRAP_SESSION); +// Reset configurable timezones. +$conf['configurable_timezones'] = $configurable_timezones; + // Only allow the requirements check to proceed if the current user has access // to run updates (since it may expose sensitive information about the site's // configuration). |