From 915138d3baa850eb6c862cfaf57c3dff643a0ee8 Mon Sep 17 00:00:00 2001
From: alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>
Date: Thu, 5 Jan 2012 09:56:18 +0000
Subject: - Update timezone in user prefs too (#1488291)

git-svn-id: https://svn.roundcube.net/trunk@5714 208e9e7b-5314-0410-a742-e7e81cd9613c
---
 roundcubemail/program/include/rcube_config.php | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'roundcubemail/program/include/rcube_config.php')

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);
 
-- 
cgit v1.2.3