Changeset 601 for trunk/lib/ACL.inc.php

Timestamp:

Apr 27, 2017 4:43:35 PM (7 years ago)

Author:

anonymous

Message:

Updated every instance of 'zero' date 0000-00-00 to use 1000-01-01 if mysql version >= 5.7.4

File:

• trunk/lib/ACL.inc.php (modified) (3 diffs)

trunk/lib/ACL.inc.php

@@ -162 +162 @@
 
             // acl_tbl
-            $db->query("
+            $db->query(sprintf("
                 CREATE TABLE IF NOT EXISTS acl_tbl (
                     aro_id SMALLINT UNSIGNED NOT NULL DEFAULT '0',
@@ -168 +168 @@
                     axo_id SMALLINT UNSIGNED NOT NULL DEFAULT '0',
                     access ENUM('allow', 'deny') DEFAULT NULL,
-                    added_datetime DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
+                    added_datetime DATETIME NOT NULL DEFAULT '%s 00:00:00',
                     UNIQUE KEY (aro_id, aco_id, axo_id),
                     KEY (access)
                 ) ENGINE=MyISAM
-            ");
+            ", $db->getParam('zero_date')));
             if (!$db->columnExists('acl_tbl', array(
                 'aro_id',
@@ -192 +192 @@
             // aro_tbl, aco_tbl, axo_tbl
             foreach (array('aro', 'aco', 'axo') as $a_o) {
-                $db->query("
-                    CREATE TABLE IF NOT EXISTS {$a_o}_tbl (
-                        {$a_o}_id SMALLINT UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT,
-                        name VARCHAR(" . $this->getParam('name_max_length') . ") NOT NULL DEFAULT '',
+                $db->query(sprintf("
+                    CREATE TABLE IF NOT EXISTS %1\$s_tbl (
+                        %1\$s_id SMALLINT UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT,
+                        name VARCHAR(%2\$s) NOT NULL DEFAULT '',
                         lft MEDIUMINT UNSIGNED NOT NULL DEFAULT '0',
                         rgt MEDIUMINT UNSIGNED NOT NULL DEFAULT '0',
-                        added_datetime DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
+                        added_datetime DATETIME NOT NULL DEFAULT '%3\$s 00:00:00',
                         UNIQUE KEY name (name(15)),
                         KEY transversal (lft, rgt)
                     ) ENGINE=MyISAM;
-                ");
+                ", $a_o, $this->getParam('name_max_length'), $db->getParam('zero_date')));
 
                 if (!$db->columnExists("{$a_o}_tbl", array(