summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2011-01-19 13:43:56 +0000
committeralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2011-01-19 13:43:56 +0000
commit49c259fcddfdd03f8631cee69c6869c6fe4d2220 (patch)
treec7aaa3c0ae0289119769d81dcf76545ff51eb755
parent9c1edb8e948dff4728b82538cc31b3865fafa4d7 (diff)
- Fix setting timezone in Preferences (#1487705)
git-svn-id: https://svn.roundcube.net/trunk@4429 208e9e7b-5314-0410-a742-e7e81cd9613c
-rw-r--r--roundcubemail/CHANGELOG1
-rw-r--r--roundcubemail/program/steps/settings/func.inc1
-rw-r--r--roundcubemail/program/steps/settings/save_prefs.inc2
3 files changed, 3 insertions, 1 deletions
diff --git a/roundcubemail/CHANGELOG b/roundcubemail/CHANGELOG
index 0d929f983..3661147ad 100644
--- a/roundcubemail/CHANGELOG
+++ b/roundcubemail/CHANGELOG
@@ -6,6 +6,7 @@ CHANGELOG Roundcube Webmail
- Fix %h/%z variables in username_domain option (#1487701)
- Workaround for setting charset in case of malformed bodystructure response (#1487700)
- Fix impossible to subscribe to protected folders (#1487656)
+- Fix setting timezone in Preferences (#1487705)
RELEASE 0.5
-----------
diff --git a/roundcubemail/program/steps/settings/func.inc b/roundcubemail/program/steps/settings/func.inc
index 9eebdbedf..7f4e28255 100644
--- a/roundcubemail/program/steps/settings/func.inc
+++ b/roundcubemail/program/steps/settings/func.inc
@@ -756,7 +756,6 @@ function rcmail_get_skins()
return $skins;
}
-
// register UI objects
$OUTPUT->add_handlers(array(
'prefsframe' => 'rcmail_preferences_frame',
diff --git a/roundcubemail/program/steps/settings/save_prefs.inc b/roundcubemail/program/steps/settings/save_prefs.inc
index 4d8bbf527..64aeb5f81 100644
--- a/roundcubemail/program/steps/settings/save_prefs.inc
+++ b/roundcubemail/program/steps/settings/save_prefs.inc
@@ -129,6 +129,8 @@ switch ($CURR_SECTION)
if (isset($CONFIG['max_pagesize']) && ($a_user_prefs['pagesize'] > $CONFIG['max_pagesize']))
$a_user_prefs['pagesize'] = (int) $CONFIG['max_pagesize'];
+ $a_user_prefs['timezone'] = $_SESSION['timezone'] = (string) $a_user_prefs['timezone'];
+
break;
case 'mailbox':