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

Timestamp:

Jun 8, 2018 3:41:16 AM (6 years ago)

Author:

anonymous

Message:

Disable App::sslOn(). Better logging on Email::send() unreplaced variables. Fix the elusive 'Database table session_tbl has invalid columns' error.

File:

• trunk/lib/DB.inc.php (modified) (5 diffs)

trunk/lib/DB.inc.php

@@ -78 +78 @@
 
     // Caches.
-    protected $existing_tables;
-    protected $table_columns;
+    protected static $existing_tables = null;
+    protected static $table_columns = null;
 
     /**
@@ -377 +377 @@
         }
 
-        if (!isset($this->existing_tables) || !$use_cached_results) {
-            $this->existing_tables = array();
+        if (is_null(self::$existing_tables) || !$use_cached_results) {
+            self::$existing_tables = array();
             $qid = $this->query("SHOW TABLES");
             while (list($row) = mysql_fetch_row($qid)) {
-                $this->existing_tables[] = $row;
+                self::$existing_tables[] = $row;
             }
         }
-        if (in_array($table, $this->existing_tables)) {
+
+        if (in_array($table, self::$existing_tables)) {
             return true;
         } else {
@@ -421 +422 @@
         }
 
-        if (!isset($this->table_columns[$table]) || !$use_cached_results) {
+        if (!isset(self::$table_columns[$table]) || !$use_cached_results) {
             // Populate and cache array of current columns for this table.
-            $this->table_columns[$table] = array();
+            self::$table_columns[$table] = array();
             $qid = $this->query("DESCRIBE $table");
             while ($row = mysql_fetch_row($qid)) {
-                $this->table_columns[$table][] = $row[0];
+                self::$table_columns[$table][] = $row[0];
             }
         }
@@ -433 +434 @@
             // Do an exact comparison of table schemas.
             sort($columns);
-            sort($this->table_columns[$table]);
-            return $this->table_columns[$table] == $columns;
+            sort(self::$table_columns[$table]);
+            return self::$table_columns[$table] == $columns;
         } else {
             // Only check that the specified columns are available in the table.
-            $match_columns = array_intersect($this->table_columns[$table], $columns);
+            $match_columns = array_intersect(self::$table_columns[$table], $columns);
             sort($columns);
             sort($match_columns);
@@ -467 +468 @@
     public function resetCache()
     {
-        $this->existing_tables = null;
-        $this->table_columns = null;
+        self::$existing_tables = null;
+        self::$table_columns = null;
     }