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

Merge branch 'QA_5_0' into 'master'

Browse Source 
Signed-off-by: William Desportes <williamdes@wdes.fr>
This commit is contained in:
William Desportes 2019-08-11 18:48:54 +02:00
commit a7357d225a
No known key found for this signature in database
GPG Key ID: 90A0EF1B8251A889
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -58,6 +58,7 @@ phpMyAdmin - ChangeLog
- issue Added description for the _ks (kana-sensitive) collation suffix
- issue Added description for the _nopad (NO PAD) collation suffix
- issue #15404 Remove array/string curly braces access
- issue #15427 Fixed "FilterLanguages" option does not work (configuration)
4.9.0.1 (2019-06-04)
- issue #14478 phpMyAdmin no longer streams the export data

5
libraries/classes/LanguageManager.php
View File

@ -731,11 +731,12 @@ class LanguageManager
public function availableLocales()
{
if (! $this->_available_locales) {
if (empty($GLOBALS['cfg']['FilterLanguages'])) {
if (! isset($GLOBALS['PMA_Config']) || empty($GLOBALS['PMA_Config']->get('FilterLanguages'))) {
$this->_available_locales = $this->listLocaleDir();
} else {
$this->_available_locales = preg_grep(
'@' . $GLOBALS['cfg']['FilterLanguages'] . '@',
'@' . $GLOBALS['PMA_Config']->get('FilterLanguages') . '@',
$this->listLocaleDir()
);
}

6
test/classes/LanguageTest.php
View File

@ -54,13 +54,13 @@ class LanguageTest extends PmaTestCase
*/
public function testAvailable()
{
$GLOBALS['cfg']['FilterLanguages'] = 'cs|en$';
$GLOBALS['PMA_Config']->set('FilterLanguages', 'cs|en$');
$langs = $this->manager->availableLocales();
$this->assertCount(2, $langs);
$this->assertContains('cs', $langs);
$GLOBALS['cfg']['FilterLanguages'] = '';
$GLOBALS['PMA_Config']->set('FilterLanguages', '');
}
/**
@ -70,7 +70,7 @@ class LanguageTest extends PmaTestCase
*/
public function testAllAvailable()
{
$GLOBALS['cfg']['FilterLanguages'] = '';
$GLOBALS['PMA_Config']->set('FilterLanguages', '');
$langs = $this->manager->availableLocales();