Permalink
Browse files

bug #3995 Drizzle server charset notice

  • Loading branch information...
1 parent e03797c commit a498a6c8cb73ca5aaec14f4857618c47081febe6 @lem9 lem9 committed Oct 6, 2013
Showing with 7 additions and 4 deletions.
  1. +1 −0 ChangeLog
  2. +5 −3 index.php
  3. +1 −1 libraries/sqlparser.lib.php
View
@@ -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
View
@@ -258,9 +258,11 @@
echo ' <li id="li_select_mysql_charset">';
echo ' ' . __('Server charset') . ': '
- . ' <span lang="en" dir="ltr">'
- . ' ' . $mysql_charsets_descriptions[$mysql_charset_map['utf-8']] . "\n"
- . ' (' . $mysql_charset_map['utf-8'] . ')' . "\n"
+ . ' <span lang="en" dir="ltr">';
+ if (! PMA_DRIZZLE) {
+ echo ' ' . $mysql_charsets_descriptions[$mysql_charset_map['utf-8']] . "\n";
+ }
+ echo ' (' . $mysql_charset_map['utf-8'] . ')' . "\n"
. ' </span>' . "\n"
. ' </li>' . "\n";
echo ' </ul>';
@@ -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)) {

0 comments on commit a498a6c

Please sign in to comment.