summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Bruederli <thomas@roundcube.net>2012-05-26 15:28:53 +0200
committerThomas Bruederli <thomas@roundcube.net>2012-05-26 15:28:53 +0200
commit37202827d3481230433958258f64c636d3e9fdf4 (patch)
treeac2f268953bfd8483b604a4697b518f7e2f46435
parentb4b5ba7e9da8879d07d41e23b6fd0f6ace104da4 (diff)
parent6d3e53d2b8a24e594f7c7fe93a0632a8171cdab3 (diff)
Merge branch 'master' of github.com:roundcube/roundcubemail
-rw-r--r--program/steps/settings/func.inc13
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);