summaryrefslogtreecommitdiff
path: root/roundcubemail/program/include/main.inc
diff options
context:
space:
mode:
authoralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2012-01-06 10:55:07 +0000
committeralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2012-01-06 10:55:07 +0000
commitee4efc78186507efbee9a55fc889d37ab570f199 (patch)
tree832c3d03ab52c601e4805fdc6a0f87785a324b0b /roundcubemail/program/include/main.inc
parentefbd7fdce36f3ecbc53623eeff93b7998fcc7528 (diff)
- Fix typo in timezone handling, more exception catching
git-svn-id: https://svn.roundcube.net/trunk@5733 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program/include/main.inc')
-rw-r--r--roundcubemail/program/include/main.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/roundcubemail/program/include/main.inc b/roundcubemail/program/include/main.inc
index f6e2ca206..148c2bd5c 100644
--- a/roundcubemail/program/include/main.inc
+++ b/roundcubemail/program/include/main.inc
@@ -1072,7 +1072,7 @@ function format_date($date, $format=NULL, $convert=true)
try {
// convert to the right timezone
$stz = date_default_timezone_get();
- $tz = new DateTimeZone($convert ? $RCMAIL->config->get('timezones') : 'GMT');
+ $tz = new DateTimeZone($convert ? $RCMAIL->config->get('timezone') : 'GMT');
$date->setTimezone($tz);
date_default_timezone_set($tz->getName());