Changeset 5733 in subversion

Timestamp:

Jan 6, 2012 5:55:07 AM (17 months ago)

Author:

alec

Message:

• Fix typo in timezone handling, more exception catching

Location:

trunk/roundcubemail/program/include

Files:

• main.inc (modified) (1 diff)
• rcube_config.php (modified) (1 diff)

trunk/roundcubemail/program/include/main.inc

@@ -1073 +1073 @@
     // convert to the right timezone
     $stz = date_default_timezone_get();
-    $tz = new DateTimeZone($convert ? $RCMAIL->config->get('timezones') : 'GMT');
+    $tz = new DateTimeZone($convert ? $RCMAIL->config->get('timezone') : 'GMT');
     $date->setTimezone($tz);
     date_default_timezone_set($tz->getName());

trunk/roundcubemail/program/include/rcube_config.php

@@ -255 +255 @@
     public function get_timezone()
     {
-      if ($this->get('timezone')) {
-        $tz = new DateTimeZone($this->get('timezone'));
-        return $tz->getOffset(new DateTime('now')) / 3600;
+      if ($tz = $this->get('timezone')) {
+        try {
+          $tz = new DateTimeZone($tz);
+          return $tz->getOffset(new DateTime('now')) / 3600;
+        }
+        catch (Exception $e) {
+        }
       }