summaryrefslogtreecommitdiff
path: root/program
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2012-01-05 09:56:18 +0000
committeralecpl <alec@alec.pl>2012-01-05 09:56:18 +0000
commitc21d7fa7876d2160c3771e892be4a6e06cc143e3 (patch)
treef1b9efdb39de11ce84cd4818944832d2cddf4138 /program
parentf5d62f7157a629d8d1611d848be6e4167dd17075 (diff)
- Update timezone in user prefs too (#1488291)
Diffstat (limited to 'program')
-rw-r--r--program/include/rcube_config.php5
1 files changed, 5 insertions, 0 deletions
diff --git a/program/include/rcube_config.php b/program/include/rcube_config.php
index 18a90a969..e16395711 100644
--- a/program/include/rcube_config.php
+++ b/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);