bug #3995 Drizzle server charset notice

phpmyadmin · Oct 6, 2013 · a498a6c · a498a6c
1 parent e03797c
commit a498a6c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -4,6 +4,7 @@ phpMyAdmin - ChangeLog
 4.0.9.0 (not yet released)
 - bug #4104 Can't edit updatable view when searching
 - bug #4108 Missing refresh by deleting databases
+- bug #3995 Drizzle server charset notice
 
 4.0.8.0 (2013-10-06)
 - bug #3988 Rename view is not working

diff --git a/index.php b/index.php
@@ -258,9 +258,11 @@
 
     echo '    <li id="li_select_mysql_charset">';
     echo '        ' . __('Server charset') . ': '
-       . '        <span lang="en" dir="ltr">'
+       . '        <span lang="en" dir="ltr">';
-       . '           ' . $mysql_charsets_descriptions[$mysql_charset_map['utf-8']] . "\n"
+    if (! PMA_DRIZZLE) {
-       . '           (' . $mysql_charset_map['utf-8'] . ')' . "\n"
+        echo '           ' . $mysql_charsets_descriptions[$mysql_charset_map['utf-8']] . "\n";
+    }
+    echo '           (' . $mysql_charset_map['utf-8'] . ')' . "\n"
        . '        </span>' . "\n"
        . '    </li>' . "\n";
     echo '  </ul>';

diff --git a/libraries/sqlparser.lib.php b/libraries/sqlparser.lib.php
@@ -43,7 +43,7 @@
 /**
  * Charset information
  */
-if (!defined('TESTSUITE')) {
+if (!defined('TESTSUITE') && ! PMA_DRIZZLE) {
     include_once './libraries/mysql_charsets.lib.php';
 }
 if (! isset($mysql_charsets)) {