? 1006838-upgrade-timezone-warning-6.patch
? 1006838-upgrade-timezone-warning-MAKE-IT-FAIL.patch
? 904214-drupal-comments-19.patch
? 999072-drupal-system-listing.patch
? drupal_904214.patch
? out
? patch
? modules/user/out
? sites/all/modules/contrib
? sites/all/modules/custom
? sites/default/files
? sites/default/settings.php
? themes/bartik/bartik.skinr.inc
? themes/bartik/skins
Index: update.php
===================================================================
RCS file: /cvs/drupal/drupal/update.php,v
retrieving revision 1.328
diff -u -p -r1.328 update.php
--- update.php	4 Jan 2011 05:57:26 -0000	1.328
+++ update.php	6 Jan 2011 20:07:50 -0000
@@ -349,9 +349,18 @@ require_once DRUPAL_ROOT . '/includes/en
 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);
+variable_set('configurable_timezones', 0);
+
 // Determine if the current user has access to run update.php.
 drupal_bootstrap(DRUPAL_BOOTSTRAP_SESSION);
 
+// Reset configurable timezones.
+variable_set('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).
Index: modules/simpletest/tests/upgrade/drupal-6.bare.database.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/tests/upgrade/drupal-6.bare.database.php,v
retrieving revision 1.1
diff -u -p -r1.1 drupal-6.bare.database.php
--- modules/simpletest/tests/upgrade/drupal-6.bare.database.php	28 Jun 2010 02:05:47 -0000	1.1
+++ modules/simpletest/tests/upgrade/drupal-6.bare.database.php	6 Jan 2011 20:07:51 -0000
@@ -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',