From eca65975b3a54f36c59c6152f3a7559c83f6efe0 Mon Sep 17 00:00:00 2001
From: apoorv <apoorvkhare007@gmail.com>
Date: Mon, 25 Mar 2019 12:36:13 +0530
Subject: Fixes #15059 Server charset hardcoded in index.php

Signed-off-by: Apoorv Khare <apoorvkhare007@gmail.com>
---
 index.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'index.php')

diff --git a/index.php b/index.php
index 2274e69122..0276d7e1e0 100644
--- a/index.php
+++ b/index.php
@@ -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>'
-- 
cgit v1.2.3