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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Weblate 2014-01-07 14:43:06 +01:00
commit 09eb263e1f
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -25,6 +25,7 @@ phpMyAdmin - ChangeLog
- bug #4213 Datetime Quick Edit decrements by one day
- bug #4217 Current value not highlighted when browsing foreign values
- bug #4220 Incorrect key values in foreign key browser
- bug #4215 MariaDB 5.5: error in Drizzle detection
4.1.3.0 (2013-12-31)
- bug #3938 PDFDefaultPageSize doc and easy configurability

2
libraries/DatabaseInterface.class.php
View File

@ -1461,7 +1461,7 @@ class PMA_DatabaseInterface
/* Detect Drizzle - it does not support charsets */
$charset_result = $this->query(
'SHOW VARIABLES LIKE "character_set_results"',
"SHOW VARIABLES LIKE 'character_set_results'",
$link
);
if ($this->numRows($charset_result) == 0) {