summaryrefslogtreecommitdiff
path: root/roundcubemail/program
diff options
context:
space:
mode:
authoralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2012-01-05 09:56:18 +0000
committeralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2012-01-05 09:56:18 +0000
commit915138d3baa850eb6c862cfaf57c3dff643a0ee8 (patch)
treeb0b8fad42505521cf9fe28c558626889b4e81e0e /roundcubemail/program
parent869b31cb77d2d2eff55e298df0ed99734aa227e2 (diff)
- Update timezone in user prefs too (#1488291)
git-svn-id: https://svn.roundcube.net/trunk@5714 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program')
-rw-r--r--roundcubemail/program/include/rcube_config.php5
1 files changed, 5 insertions, 0 deletions
diff --git a/roundcubemail/program/include/rcube_config.php b/roundcubemail/program/include/rcube_config.php
index 18a90a969..e16395711 100644
--- a/roundcubemail/program/include/rcube_config.php
+++ b/roundcubemail/program/include/rcube_config.php
@@ -219,6 +219,11 @@ class rcube_config
}
}
+ // convert user's timezone into the new format
+ if (is_numeric($prefs['timezone'])) {
+ $prefs['timezone'] = timezone_name_from_abbr('', $prefs['timezone'] * 3600, 0);
+ }
+
$this->userprefs = $prefs;
$this->prop = array_merge($this->prop, $prefs);