Merge branch 'master' of github.com:roundcube/roundcubemail

1 files changed, 8 insertions, 5 deletions

diff --git a/program/steps/settings/func.inc b/program/steps/settings/func.inc
index 2c2d17f21..7b5534e5d 100644
--- a/program/steps/settings/func.inc
+++ b/program/steps/settings/func.inc
@@ -183,11 +183,14 @@ function rcmail_user_prefs($current=null)
 
       $now = new DateTime();
       foreach (DateTimeZone::listIdentifiers() as $i => $tzs) {
-        $tz = new DateTimeZone($tzs);
-        $date = new DateTime('2012-12-21', $tz);
-        $offset = $date->format('Z') + 45000;
-        $sortkey = sprintf('%06d.%s', $offset, $tzs);
-        $zones[$sortkey] = array($tzs, $date->format('P'));
+        try {
+          $tz = new DateTimeZone($tzs);
+          $date = new DateTime('2012-12-21', $tz);
+          $offset = $date->format('Z') + 45000;
+          $sortkey = sprintf('%06d.%s', $offset, $tzs);
+          $zones[$sortkey] = array($tzs, $date->format('P'));
+        }
+        catch (Exception $e) {}
       }
 
       ksort($zones);