mirror of
https://github.com/moodle/moodle.git
synced 2025-04-16 14:02:32 +02:00
Merging unmerged code. MDL-11743 and MDL-11671
This commit is contained in:
parent
41079ed4bb
commit
d4775d5495
@ -174,7 +174,7 @@ function setup_is_unicodedb() {
|
||||
|
||||
switch ($dbfamily) {
|
||||
case 'mysql':
|
||||
$rs = $db->Execute("SHOW VARIABLES LIKE 'character_set_database'");
|
||||
$rs = $db->Execute("SHOW LOCAL VARIABLES LIKE 'character_set_database'");
|
||||
if ($rs && !$rs->EOF) { // rs_EOF() not available yet
|
||||
$records = $rs->GetAssoc(true);
|
||||
$encoding = $records['character_set_database']['Value'];
|
||||
|
Loading…
x
Reference in New Issue
Block a user