summaryrefslogtreecommitdiff
path: root/program
diff options
context:
space:
mode:
authorthomascube <thomas@roundcube.net>2011-09-28 14:26:23 +0000
committerthomascube <thomas@roundcube.net>2011-09-28 14:26:23 +0000
commit985e410012f1a7937f4c7d0bbe2b9c0b1a40b693 (patch)
tree56798243c48b21bccd2edf559eaabd45695bcaa7 /program
parent801b69d3ab184df5c4e610d19202fc49385d2bd2 (diff)
Unset auto timezone value if overwritten by user prefs
Diffstat (limited to 'program')
-rw-r--r--program/include/rcube_config.php2
1 files changed, 2 insertions, 0 deletions
diff --git a/program/include/rcube_config.php b/program/include/rcube_config.php
index 1c8e23733..338e07e4b 100644
--- a/program/include/rcube_config.php
+++ b/program/include/rcube_config.php
@@ -222,6 +222,8 @@ class rcube_config
$this->prop['_timezone_value'] = isset($_SESSION['timezone']) ? $_SESSION['timezone'] : $this->prop['_timezone_value'];
$this->prop['dst_active'] = isset($_SESSION['dst_active']) ? $_SESSION['dst_active'] : $this->prop['dst_active'];
}
+ else if (isset($this->prop['_timezone_value']))
+ unset($this->prop['_timezone_value']);
}