gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug #3995 Drizzle server charset notice

Browse Source
This commit is contained in:
Marc Delisle 2013-10-06 09:32:24 -04:00
parent e03797cd5d
commit a498a6c8cb
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -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

8
index.php
View File

@ -258,9 +258,11 @@ if ($server > 0 && $GLOBALS['cfg']['ShowServerInfo']) {
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>';

2
libraries/sqlparser.lib.php
View File

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