From 810a59576d7bd001000dab4842cf83bac210e522 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Fri, 21 May 2010 11:43:27 +0000
Subject: - Patch #805052 by mikey_p: notice in update.php in
 drupal_session_initialize().

---
 includes/update.inc | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'includes')

diff --git a/includes/update.inc b/includes/update.inc
index bc2501296..950886bbc 100644
--- a/includes/update.inc
+++ b/includes/update.inc
@@ -179,6 +179,12 @@ function update_prepare_d7_bootstrap() {
     );
     db_create_table('cache_bootstrap', $cache_bootstrap);
   }
+
+  // Set a valid timezone for 6 -> 7 upgrade process.
+  drupal_bootstrap(DRUPAL_BOOTSTRAP_VARIABLES);
+  if (is_numeric(variable_get('date_default_timezone', 0))) {
+    $GLOBALS['conf']['date_default_timezone'] = 'UTC';
+  }
 }
 
 /**
-- 
cgit v1.2.3