- Patch #1006838 by coltrane: upgrade to 7 glaring timezone invalid notice.

merge-requests/26/head
Dries Buytaert 2011-02-21 20:05:26 +00:00
parent b20486762f
commit faa920f9e6
2 changed files with 11 additions and 2 deletions

View File

@ -7902,7 +7902,7 @@ db_insert('users')->fields(array(
'access' => '0',
'login' => '0',
'status' => '0',
'timezone' => NULL,
'timezone' => '-21600',
'language' => '',
'picture' => '',
'init' => '',
@ -7923,7 +7923,7 @@ db_insert('users')->fields(array(
'access' => '1277671612',
'login' => '1277671612',
'status' => '1',
'timezone' => NULL,
'timezone' => '-21600',
'language' => '',
'picture' => '',
'init' => 'admin@example.com',

View File

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