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

Merge branch 'QA_4_5' of github.com:phpmyadmin/phpmyadmin into QA_4_5

Browse Source
This commit is contained in:
Madhura Jayaratne 2015-08-31 22:44:32 +10:00
commit 53bbff7311
3 changed files with 29 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -104,6 +104,7 @@ phpMyAdmin - ChangeLog
- issue #11421 Stored-proc / routine - broken parameter parsing
- issue Missing name for configuration read_as_multibytes
- issue #11431 Incorrect "No row selected" message
- issue #11447 MySQL 5.5 and the language system variable
4.4.14.0 (2015-08-20)
- issue #11367 Export after search, missing WHERE clause

53
libraries/DatabaseInterface.class.php
View File

@ -292,45 +292,46 @@ class PMA_DatabaseInterface
public function convertMessage($message)
{
// latin always last!
// @todo some values are missing,
// see https://mariadb.com/kb/en/mariadb/server-locale/
$encodings = array(
'japanese' => 'EUC-JP', //'ujis',
'japanese-sjis' => 'Shift-JIS', //'sjis',
'korean' => 'EUC-KR', //'euckr',
'russian' => 'KOI8-R', //'koi8r',
'ukrainian' => 'KOI8-U', //'koi8u',
'greek' => 'ISO-8859-7', //'greek',
'serbian' => 'CP1250', //'cp1250',
'estonian' => 'ISO-8859-13', //'latin7',
'slovak' => 'ISO-8859-2', //'latin2',
'czech' => 'ISO-8859-2', //'latin2',
'hungarian' => 'ISO-8859-2', //'latin2',
'polish' => 'ISO-8859-2', //'latin2',
'romanian' => 'ISO-8859-2', //'latin2',
'spanish' => 'CP1252', //'latin1',
'swedish' => 'CP1252', //'latin1',
'italian' => 'CP1252', //'latin1',
'norwegian-ny' => 'CP1252', //'latin1',
'norwegian' => 'CP1252', //'latin1',
'portuguese' => 'CP1252', //'latin1',
'danish' => 'CP1252', //'latin1',
'dutch' => 'CP1252', //'latin1',
'english' => 'CP1252', //'latin1',
'french' => 'CP1252', //'latin1',
'german' => 'CP1252', //'latin1',
'ja' => 'EUC-JP', //'ujis',
'ko' => 'EUC-KR', //'euckr',
'ru' => 'KOI8-R', //'koi8r',
'uk' => 'KOI8-U', //'koi8u',
'sr' => 'CP1250', //'cp1250',
'et' => 'ISO-8859-13', //'latin7',
'sk' => 'ISO-8859-2', //'latin2',
'cz' => 'ISO-8859-2', //'latin2',
'hu' => 'ISO-8859-2', //'latin2',
'pl' => 'ISO-8859-2', //'latin2',
'ro' => 'ISO-8859-2', //'latin2',
'es' => 'CP1252', //'latin1',
'sv' => 'CP1252', //'latin1',
'it' => 'CP1252', //'latin1',
'no' => 'CP1252', //'latin1',
'pt' => 'CP1252', //'latin1',
'da' => 'CP1252', //'latin1',
'nl' => 'CP1252', //'latin1',
'en' => 'CP1252', //'latin1',
'fr' => 'CP1252', //'latin1',
'de' => 'CP1252', //'latin1',
);
$server_language = PMA_Util::cacheGet(
'server_language',
function () {
return $GLOBALS['dbi']->fetchValue(
"SELECT @@language;", 0, 1
"SELECT @@lc_messages;", 0, 0
);
}
);
if ($server_language) {
$found = array();
$match = preg_match(
'&(?:\\\|\\/)([^\\\\\/]*)(?:\\\|\\/)$&i',
'&([a-z][a-z])_&i',
$server_language,
$found
);

2
libraries/dbi/DBIDummy.class.php
View File

@ -122,7 +122,7 @@ $GLOBALS['dummy_queries'] = array(
)
),
array(
'query' => 'SELECT @@language;',
'query' => 'SELECT @@lc_messages;',
'result' => array(),
),
array(