From 8f571f7e9e31743681832297973293422f8744c5 Mon Sep 17 00:00:00 2001 From: William Desportes Date: Mon, 7 May 2018 01:01:27 +0200 Subject: [PATCH 1/2] #14260 Fixed configuration for DefaultLang and Lang MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes: #14260 Signed-off-by: William Desportes (cherry picked from commit 2f84b4034e4c423512029534e7a6132e6f8dc4d3) Signed-off-by: Maurício Meneghini Fauth --- libraries/classes/LanguageManager.php | 8 ++++---- test/classes/LanguageTest.php | 9 +++++---- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/libraries/classes/LanguageManager.php b/libraries/classes/LanguageManager.php index 19270ded72..25268de0d2 100644 --- a/libraries/classes/LanguageManager.php +++ b/libraries/classes/LanguageManager.php @@ -822,8 +822,8 @@ class LanguageManager public function selectLanguage() { // check forced language - if (! empty($GLOBALS['cfg']['Lang'])) { - $lang = $this->getLanguage($GLOBALS['cfg']['Lang']); + if (! empty($GLOBALS['PMA_Config']->get('Lang'))) { + $lang = $this->getLanguage($GLOBALS['PMA_Config']->get('Lang')); if ($lang !== false) { return $lang; } @@ -883,8 +883,8 @@ class LanguageManager } // Didn't catch any valid lang : we use the default settings - if (isset($langs[$GLOBALS['cfg']['DefaultLang']])) { - return $langs[$GLOBALS['cfg']['DefaultLang']]; + if (isset($langs[$GLOBALS['PMA_Config']->get('DefaultLang')])) { + return $langs[$GLOBALS['PMA_Config']->get('DefaultLang')]; } // Fallback to English diff --git a/test/classes/LanguageTest.php b/test/classes/LanguageTest.php index 39e41de28b..edf952ec66 100644 --- a/test/classes/LanguageTest.php +++ b/test/classes/LanguageTest.php @@ -158,25 +158,25 @@ class LanguageTest extends PmaTestCase */ public function testSelect($lang, $post, $get, $cookie, $accept, $agent, $default, $expect) { - $GLOBALS['cfg']['Lang'] = $lang; + $GLOBALS['PMA_Config']->set('Lang', $lang); $_POST['lang'] = $post; $_GET['lang'] = $get; $_COOKIE['pma_lang'] = $cookie; $_SERVER['HTTP_ACCEPT_LANGUAGE'] = $accept; $_SERVER['HTTP_USER_AGENT'] = $agent; - $GLOBALS['cfg']['DefaultLang'] = $default; + $GLOBALS['PMA_Config']->set('DefaultLang', $default); $lang = $this->manager->selectLanguage(); $this->assertEquals($expect, $lang->getEnglishName()); - $GLOBALS['cfg']['Lang'] = ''; + $GLOBALS['PMA_Config']->set('Lang', ''); $_POST['lang'] = ''; $_GET['lang'] = ''; $_COOKIE['pma_lang'] = ''; $_SERVER['HTTP_ACCEPT_LANGUAGE'] = ''; $_SERVER['HTTP_USER_AGENT'] = ''; - $GLOBALS['cfg']['DefaultLang'] = 'en'; + $GLOBALS['PMA_Config']->set('DefaultLang', 'en'); } /** @@ -191,6 +191,7 @@ class LanguageTest extends PmaTestCase array('', 'cs', '', '' ,'' ,'', '', 'Czech'), array('', 'cs', 'en', '' ,'' ,'', '', 'Czech'), array('', '', 'cs', '' ,'' ,'', '', 'Czech'), + array('', '', '', 'cs' ,'' ,'', '', 'Czech'), array('', '', '', '' ,'cs,en-US;q=0.7,en;q=0.3' ,'', '', 'Czech'), array( '', '', '', '', '', From 4ee541a0000876e88c0facee1be12d2d4a90fe24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= Date: Sun, 6 May 2018 21:17:50 -0300 Subject: [PATCH 2/2] Add ChangeLog entry for #14260 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maurício Meneghini Fauth --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 03a61a5c26..df72c9e517 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,7 @@ phpMyAdmin - ChangeLog - issue #14128 Show 2FA Secret next to QR code - issue #14212 XML Export from single table throws fatal error - issue #14239 Line and some other charts ignore result set order of values chosen for the x-axis +- issue #14260 Fixed configuration for DefaultLang and Lang 4.8.0.1 (2018-04-19) - issue [security] Multiple CSRF vulnerabilities, See PMASA-2018-02