Changeset 658 for trunk/lib

Timestamp:

Jan 26, 2019 9:50:29 PM (5 years ago)

Author:

anonymous

Message:

Fix regression

File:

• trunk/lib/DB.inc.php (modified) (1 diff)

trunk/lib/DB.inc.php

@@ -203 +203 @@
         // Set timezone.
         $tz = date_default_timezone_get();
-        // Check that PHP is configured with a valid timezone name, e.g., "UTC" or "America/Chicago".
-        if ($app->getParam('timezone') && $app->getParam('timezone') == $tz && preg_match('!^([A-Z_/-]{3,}|[-\d:]+)$!/i' '/[A-Z_\+-]{3,}|[-\d:]+/i', $tz)) {
+        // Check that PHP is configured with a valid timezone name, e.g., "UTC" or "America/Mexico_City" or "-6:00".
+        if ($app->getParam('timezone') && $app->getParam('timezone') == $tz && preg_match('!^([A-Z_/-]{3,}|[-+\d:]+)$!/i', $tz)) {
+            // https://dev.mysql.com/doc/refman/5.5/en/time-zone-support.html
             $this->query(sprintf("SET SESSION time_zone = '%s'", $tz));
         }