From cc28f82b369c2e8ebf2d0b4390379b9cda4af40b Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Thu, 30 Jul 2015 13:57:04 +0200 Subject: Add config option to update charset of mysql to utf8mb4 * fully optional * requires additional options set in the database --- lib/private/DB/AdapterMySQL.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'lib/private/DB/AdapterMySQL.php') diff --git a/lib/private/DB/AdapterMySQL.php b/lib/private/DB/AdapterMySQL.php index 3e2fceda8db..0c0c6b31021 100644 --- a/lib/private/DB/AdapterMySQL.php +++ b/lib/private/DB/AdapterMySQL.php @@ -39,7 +39,8 @@ class AdapterMySQL extends Adapter { } public function fixupStatement($statement) { - $statement = str_replace(' ILIKE ', ' COLLATE utf8_general_ci LIKE ', $statement); + $characterSet = \OC::$server->getConfig()->getSystemValue('mysql.utf8mb4', false) ? 'utf8mb4' : 'utf8'; + $statement = str_replace(' ILIKE ', ' COLLATE ' . $characterSet . '_general_ci LIKE ', $statement); return $statement; } } -- cgit v1.2.3