Changeset 657 for trunk/lib/DB.inc.php

Timestamp:

Jan 26, 2019 4:36:27 AM (5 years ago)

Author:

anonymous

Message:

Update timezone test regex to support edge cases

File:

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

trunk/lib/DB.inc.php

@@ -204 +204 @@
         $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,}|\w+/\w+!', $tz)) {
+        if ($app->getParam('timezone') && $app->getParam('timezone') == $tz && preg_match('!^([A-Z_/-]{3,}|[-\d:]+)$!/i' '/[A-Z_\+-]{3,}|[-\d:]+/i', $tz)) {
             $this->query(sprintf("SET SESSION time_zone = '%s'", $tz));
         }