fix identifiers on eninene migrate
authorAlan Knowles <alan@roojs.com>
Fri, 7 Aug 2020 07:29:03 +0000 (15:29 +0800)
committerAlan Knowles <alan@roojs.com>
Fri, 7 Aug 2020 07:29:03 +0000 (15:29 +0800)
DataObjects/I18n.php
UpdateDatabase/MysqlEngineCharset.php

index fce1fc4..739c80b 100644 (file)
@@ -226,7 +226,7 @@ class Pman_Core_DataObjects_I18n extends DB_DataObject
         
         
         static $cache = array();
-        $cache_key = implode(' ', array($inlang,$ltime,$kval));
+        $cache_key = implode(' ', array($inlang,$ltype,$kval));
         if (isset($cache[$cache_key ])) {
             return $cache[$cache_key];
         }
index ba81c63..f977bbe 100644 (file)
@@ -183,7 +183,7 @@ class Pman_Core_UpdateDatabase_MysqlEngineCharset {
             //as the default collation for stored procedure parameters is utf8_general_ci and you can't mix collations.
             
             $ce = DB_DataObject::factory('core_enum');
-            $ce->query("ALTER TABLE $tbl ENGINE=InnoDB");
+            $ce->query("ALTER TABLE `$tbl` ENGINE=InnoDB");
             echo "InnoDB: FIXED {$tbl}\n";
             
         }