summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2010-05-21 11:43:27 +0000
committerDries Buytaert <dries@buytaert.net>2010-05-21 11:43:27 +0000
commit810a59576d7bd001000dab4842cf83bac210e522 (patch)
treef7c9f3673b17abd146bf334b59111727747e8186
parentf42b6adaff5466ffb8b37e90f81a244b4e1e23da (diff)
downloadbrdo-810a59576d7bd001000dab4842cf83bac210e522.tar.gz
brdo-810a59576d7bd001000dab4842cf83bac210e522.tar.bz2
- Patch #805052 by mikey_p: notice in update.php in drupal_session_initialize().
-rw-r--r--includes/update.inc6
1 files changed, 6 insertions, 0 deletions
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';
+ }
}
/**