diff options
author | apoorv <apoorvkhare007@gmail.com> | 2019-03-25 10:06:13 +0300 |
---|---|---|
committer | apoorv <apoorvkhare007@gmail.com> | 2019-04-06 15:57:11 +0300 |
commit | eca65975b3a54f36c59c6152f3a7559c83f6efe0 (patch) | |
tree | bf28bafea46a956fc3c0d3363120ec70eacd3779 /index.php | |
parent | 8282a7f1b64e75ac05451208b05dfb2f8d2a1eb3 (diff) |
Fixes #15059 Server charset hardcoded in index.php
Signed-off-by: Apoorv Khare <apoorvkhare007@gmail.com>
Diffstat (limited to 'index.php')
-rw-r--r-- | index.php | 9 |
1 files changed, 7 insertions, 2 deletions
@@ -369,12 +369,17 @@ if ($server > 0 && $GLOBALS['cfg']['ShowServerInfo']) { echo ' <li id="li_select_mysql_charset">'; echo ' ' , __('Server charset:') , ' ' . ' <span lang="en" dir="ltr">'; - $unicode = Charsets::$mysql_charset_map['utf-8']; + + $charset = Charsets::getCharset( + $GLOBALS['dbi'], + $GLOBALS['cfg']['Server']['DisableIS'] + ); $charsets = Charsets::getMySQLCharsetsDescriptions( $GLOBALS['dbi'], $GLOBALS['cfg']['Server']['DisableIS'] ); - echo ' ' , $charsets[$unicode], ' (' . $unicode, ')'; + + echo ' ' , $charsets[$charset], ' (' . $charset, ')'; echo ' </span>' . ' </li>' . ' </ul>' |