From 4f910c4f5e5e344476feaabef36b79ee7f44a7b3 Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Thu, 17 Dec 2015 14:09:16 +0800 Subject: [PATCH] UpdateDatabase/MysqlLinks.php --- UpdateDatabase/MysqlLinks.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/UpdateDatabase/MysqlLinks.php b/UpdateDatabase/MysqlLinks.php index 9bdaa57c..5141bf97 100644 --- a/UpdateDatabase/MysqlLinks.php +++ b/UpdateDatabase/MysqlLinks.php @@ -467,20 +467,20 @@ class Pman_Core_UpdateDatabase_MysqlLinks { WHERE CCSA.collation_name = T.table_collation AND - T.table_schema = '{$ce->database()}' -- COLLATE utf8_unicode_ci + T.table_schema = '{$ce->database()}' -- COLLATE utf8_general_ci AND - T.table_name = '{$tbl}' -- COLLATE utf8_unicode_ci + T.table_name = '{$tbl}' -- COLLATE utf8_general_ci "); $ce->fetch(); - if($ce->csname == 'utf8' && $ce->collatename == 'utf8_unicode_ci'){ + if($ce->csname == 'utf8' && $ce->collatename == 'utf8_general_ci'){ echo "$tbl is Already utf8 \n"; continue; } $ce = DB_DataObject::factory('core_enum'); - $ce->query("ALTER TABLE {$tbl} CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci"); + $ce->query("ALTER TABLE {$tbl} CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci"); echo "FIXED utf8 on {$tbl}\n"; } -- 2.39.2