fixed collation compatibily with older mysql versions
This commit is contained in:
parent
9da3816a88
commit
472c342f81
|
@ -570,7 +570,7 @@ class TipsWindow
|
||||||
$sql = sprintf(
|
$sql = sprintf(
|
||||||
'SELECT id, name AS language, title, text, url, enable
|
'SELECT id, name AS language, title, text, url, enable
|
||||||
FROM twelcome_tip t
|
FROM twelcome_tip t
|
||||||
LEFT JOIN tlanguage l ON t.id_lang = l.id_language COLLATE utf8mb4_0900_ai_ci
|
LEFT JOIN tlanguage l ON t.id_lang = l.id_language COLLATE utf8mb4_unicode_ci
|
||||||
%s %s %s',
|
%s %s %s',
|
||||||
$filter,
|
$filter,
|
||||||
$order,
|
$order,
|
||||||
|
@ -582,7 +582,7 @@ class TipsWindow
|
||||||
$sqlCount = sprintf(
|
$sqlCount = sprintf(
|
||||||
'SELECT count(*)
|
'SELECT count(*)
|
||||||
FROM twelcome_tip t
|
FROM twelcome_tip t
|
||||||
LEFT JOIN tlanguage l ON t.id_lang = l.id_language COLLATE utf8mb4_0900_ai_ci
|
LEFT JOIN tlanguage l ON t.id_lang = l.id_language COLLATE utf8mb4_unicode_ci
|
||||||
%s',
|
%s',
|
||||||
$filter
|
$filter
|
||||||
);
|
);
|
||||||
|
|
Loading…
Reference in New Issue