summaryrefslogtreecommitdiff
path: root/includes/update.inc
diff options
context:
space:
mode:
Diffstat (limited to 'includes/update.inc')
-rw-r--r--includes/update.inc6
1 files changed, 5 insertions, 1 deletions
diff --git a/includes/update.inc b/includes/update.inc
index 8ab682faa..3c8e051c2 100644
--- a/includes/update.inc
+++ b/includes/update.inc
@@ -199,7 +199,11 @@ function update_prepare_d7_bootstrap() {
// Set a valid timezone for 6 -> 7 upgrade process.
drupal_bootstrap(DRUPAL_BOOTSTRAP_VARIABLES);
- if (is_numeric(variable_get('date_default_timezone', 0))) {
+ $timezone_offset = variable_get('date_default_timezone', 0);
+ if (is_numeric($timezone_offset)) {
+ // Save the original offset.
+ variable_set('date_temporary_timezone', $timezone_offset);
+ // Set the timezone for this request only.
$GLOBALS['conf']['date_default_timezone'] = 'UTC';
}
}