Changeset 661 for trunk/lib

Timestamp:

Jan 30, 2019 11:14:22 PM (5 years ago)

Author:

anonymous

Message:

Remove cruft from timezone experiment

Location:

trunk/lib

Files:

• App.inc.php (modified) (1 diff)
• DB.inc.php (modified) (2 diffs)

trunk/lib/App.inc.php

@@ -1698 +1698 @@
     public function setTimezone($tz)
     {
-        $this->setTimezone();
         // Set timezone for PHP.
         if (date_default_timezone_set($tz)) {

trunk/lib/DB.inc.php

@@ -192 +192 @@
         $this->_connected = true;
 
-        $init_sql = array();
-
         // Tell MySQL what character set we're using. Available only on MySQL versions > 4.01.01.
         if ('' != $app->getParam('character_set') && isset($this->mysql_character_sets[mb_strtolower($app->getParam('character_set'))])) {
-            $init_sql[] = sprintf("SET NAMES '%s'", $this->mysql_character_sets[mb_strtolower($app->getParam('character_set'))]);
+            $this->query(sprintf("SET NAMES '%s';", $this->mysql_character_sets[mb_strtolower($app->getParam('character_set'))]));
         } else {
             $app->logMsg(sprintf('%s is not a known character_set.', $app->getParam('character_set')), LOG_ERR, __FILE__, __LINE__);
@@ -209 +207 @@
         if ($this->getParam('timezone')) {
             // https://dev.mysql.com/doc/refman/5.5/en/time-zone-support.html
-            $init_sql[] = sprintf("SET time_zone = '%s'", $this->getParam('timezone'));
-        }
-
-        // Run init query, if set.
-        if (!empty($init_sql)) {
-            $this->query(join('; ', $init_sql));
+            $this->query(sprintf("SET time_zone = '%s';", $this->getParam('timezone')));
         }