diff --git a/ChangeLog b/ChangeLog index 29690cb8f2..9ae6a2bfc1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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 diff --git a/libraries/classes/LanguageManager.php b/libraries/classes/LanguageManager.php index 22966ca782..6dd75c6cfe 100644 --- a/libraries/classes/LanguageManager.php +++ b/libraries/classes/LanguageManager.php @@ -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() ); } diff --git a/test/classes/LanguageTest.php b/test/classes/LanguageTest.php index 4907431979..a557c37977 100644 --- a/test/classes/LanguageTest.php +++ b/test/classes/LanguageTest.php @@ -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();