gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix #15614 - Undefined offset on index page for MySQL 5.7.8

Browse Source 
Signed-off-by: William Desportes <williamdes@wdes.fr>
This commit is contained in:
William Desportes 2019-12-21 23:36:41 +01:00
parent ba570e102d
commit 823aad9ad6
No known key found for this signature in database
GPG Key ID: 90A0EF1B8251A889
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
index.php
View File

@ -376,7 +376,7 @@ if ($server > 0 && $GLOBALS['cfg']['ShowServerInfo']) {
$GLOBALS['cfg']['Server']['DisableIS']
);
echo ' ' , $charsets[$charset], ' (' . $charset, ')';
echo ' ' , (isset($charsets[$charset]) ? $charsets[$charset] : '') , ' (' . $charset, ')';
echo ' </span>'
. ' </li>'
. ' </ul>'

6
libraries/classes/Charsets.php
View File

@ -147,7 +147,11 @@ class Charsets
if (self::$_charset_server) {
return self::$_charset_server;
} else {
self::$_charset_server = $dbi->getVariable('character_set_server');
$charsetServer = $dbi->getVariable('character_set_server');
if (! is_string($charsetServer)) {// MySQL 5.7.8 fallback, issue #15614
$charsetServer = $dbi->fetchValue("SELECT @@character_set_server;");
}
self::$_charset_server = $charsetServer;
return self::$_charset_server;
}
}