diff options
| -rw-r--r-- | program/include/rcube_imap.php | 4 | ||||
| -rw-r--r-- | program/steps/settings/func.inc | 13 |
2 files changed, 10 insertions, 7 deletions
diff --git a/program/include/rcube_imap.php b/program/include/rcube_imap.php index 3b44da376..419e26c65 100644 --- a/program/include/rcube_imap.php +++ b/program/include/rcube_imap.php @@ -2916,11 +2916,11 @@ class rcube_imap extends rcube_storage // get list of subscribed folders if ((strpos($folder, '%') === false) && (strpos($folder, '*') === false)) { - $a_subscribed = $this->_list_folders_subscribed('', $folder . $delm . '*'); + $a_subscribed = $this->list_folders_subscribed('', $folder . $delm . '*'); $subscribed = $this->folder_exists($folder, true); } else { - $a_subscribed = $this->_list_folders_subscribed(); + $a_subscribed = $this->list_folders_subscribed(); $subscribed = in_array($folder, $a_subscribed); } diff --git a/program/steps/settings/func.inc b/program/steps/settings/func.inc index 794335958..dc7c68e3b 100644 --- a/program/steps/settings/func.inc +++ b/program/steps/settings/func.inc @@ -186,11 +186,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); |