From 1d0c3f557585a7d1ab319455a5af288f82fedf75 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Thu, 28 Jun 2012 09:21:48 +0200 Subject: Fix fatal error when date.timezone isn't set (#1488546) Conflicts: program/steps/settings/func.inc --- CHANGELOG | 1 + program/steps/settings/func.inc | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 5cc9abe53..170e199d4 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,7 @@ CHANGELOG Roundcube Webmail =========================== +- Fix fatal error when date.timezone isn't set (#1488546) - Update to TinyMCE 3.5.4.1 - Better icons with distinct shapes for priority columns (#1488377) - Show dedicated icon for multipart/report messages (#1488524) diff --git a/program/steps/settings/func.inc b/program/steps/settings/func.inc index 8f2528e69..57a2819db 100644 --- a/program/steps/settings/func.inc +++ b/program/steps/settings/func.inc @@ -184,9 +184,7 @@ function rcmail_user_prefs($current=null) $select_timezone = new html_select(array('name' => '_timezone', 'id' => $field_id)); $select_timezone->add(rcube_label('autodetect'), 'auto'); - $now = new DateTime(); $zones = array(); - foreach (DateTimeZone::listIdentifiers() as $i => $tzs) { try { $tz = new DateTimeZone($tzs); -- cgit v1.2.3