Merge remote-tracking branch 'origin/master' into drizzle

1 files changed, 2 insertions, 2 deletions

diff --git a/main.php b/main.php
index 200fc63e6d..6fbf2979ef 100644
--- a/main.php
+++ b/main.php
@@ -174,8 +174,8 @@ if ($server > 0 && $GLOBALS['cfg']['ShowServerInfo']) {
     echo '    <li id="li_select_mysql_charset">';
     echo '        ' . __('Server charset') . ': '
        . '        <span xml:lang="en" dir="ltr">'
-       . '           ' . $mysql_charsets_descriptions[$mysql_charset_map[strtolower($charset)]] . "\n"
-       . '           (' . $mysql_charset_map[strtolower($charset)] . ')' . "\n"
+       . '           ' . $mysql_charsets_descriptions[$mysql_charset_map['utf-8']] . "\n"
+       . '           (' . $mysql_charset_map['utf-8'] . ')' . "\n"
        . '        </span>' . "\n"
        . '    </li>' . "\n";
     echo '  </ul>';