From 37202827d3481230433958258f64c636d3e9fdf4 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Sat, 26 May 2012 09:28:53 -0400
Subject: [PATCH] Merge branch 'master' of github.com:roundcube/roundcubemail
---
program/steps/settings/func.inc | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/program/steps/settings/func.inc b/program/steps/settings/func.inc
index 2c2d17f..7b5534e 100644
--- a/program/steps/settings/func.inc
+++ b/program/steps/settings/func.inc
@@ -183,11 +183,14 @@
$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);
--
Gitblit v1.9.1