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

13 years ago · 37202827d3
parent b4b5ba7e9d 6d3e53d2b8
commit 37202827d3
1 changed files with 8 additions and 5 deletions
--- a/program/steps/settings/func.inc
+++ b/program/steps/settings/func.inc
@ -183,12 +183,15 @@ function rcmail_user_prefs($current=null)

      $now = new DateTime();
      foreach (DateTimeZone::listIdentifiers() as $i => $tzs) {
+        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);
      foreach ($zones as $zone) {