Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'index.php')
-rw-r--r--index.php7
1 files changed, 6 insertions, 1 deletions
diff --git a/index.php b/index.php
index c56b7c9cd4..d66365ce9b 100644
--- a/index.php
+++ b/index.php
@@ -225,6 +225,8 @@ if ($server > 0 || count($cfg['Servers']) > 1
. ' </label>' . "\n"
. Charsets::getCollationDropdownBox(
+ $GLOBALS['dbi'],
+ $GLOBALS['cfg']['Server']['DisableIS'],
'collation_connection',
'select_collation_connection',
$collation_connection,
@@ -327,7 +329,10 @@ if ($server > 0 && $GLOBALS['cfg']['ShowServerInfo']) {
echo ' ' , __('Server charset:') , ' '
. ' <span lang="en" dir="ltr">';
$unicode = Charsets::$mysql_charset_map['utf-8'];
- $charsets = Charsets::getMySQLCharsetsDescriptions();
+ $charsets = Charsets::getMySQLCharsetsDescriptions(
+ $GLOBALS['dbi'],
+ $GLOBALS['cfg']['Server']['DisableIS']
+ );
echo ' ' , $charsets[$unicode], ' (' . $unicode, ')';
echo ' </span>'
. ' </li>'