summaryrefslogtreecommitdiff
path: root/roundcubemail/program/include/rcube_config.php
diff options
context:
space:
mode:
authorthomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c>2011-09-28 14:41:04 +0000
committerthomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c>2011-09-28 14:41:04 +0000
commitd5662b8bbfd70e88894eece91506b49ce50d4054 (patch)
tree0113146f6d1ebb4477ed2fff2b52332d1a7c08eb /roundcubemail/program/include/rcube_config.php
parent11ed66a8483f653bcd217e6d8a95a9239bae21d5 (diff)
This timezone stuff really is a hard one...
git-svn-id: https://svn.roundcube.net/trunk@5289 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program/include/rcube_config.php')
-rw-r--r--roundcubemail/program/include/rcube_config.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/roundcubemail/program/include/rcube_config.php b/roundcubemail/program/include/rcube_config.php
index 338e07e4b..01e678150 100644
--- a/roundcubemail/program/include/rcube_config.php
+++ b/roundcubemail/program/include/rcube_config.php
@@ -220,7 +220,7 @@ class rcube_config
// override timezone settings with client values
if ($this->prop['timezone'] == 'auto') {
$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'];
+ $this->prop['dst_active'] = $this->userprefs['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']);