From 6f4c2d6f80256876f51cc71ae3f207a16c476866 Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Fri, 7 Aug 2020 15:29:03 +0800 Subject: [PATCH] fix identifiers on eninene migrate --- DataObjects/I18n.php | 2 +- UpdateDatabase/MysqlEngineCharset.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/DataObjects/I18n.php b/DataObjects/I18n.php index fce1fc41..739c80b3 100644 --- a/DataObjects/I18n.php +++ b/DataObjects/I18n.php @@ -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]; } diff --git a/UpdateDatabase/MysqlEngineCharset.php b/UpdateDatabase/MysqlEngineCharset.php index ba81c636..f977bbe6 100644 --- a/UpdateDatabase/MysqlEngineCharset.php +++ b/UpdateDatabase/MysqlEngineCharset.php @@ -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"; } -- 2.39.2