From 44ca7ef8f3814cd8feb2d6ac95f088e2ae0e72d1 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Wed, 16 Apr 2008 18:54:42 +0000 Subject: [PATCH] bug #1934401 [core] Cannot force a language --- ChangeLog | 1 + libraries/database_interface.lib.php | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 87dc5d893..29a2146d2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -30,6 +30,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA - bug #1935652 [auth] Access denied (show warning about mcrypt on login page) - bug #1906983 [export] Reimport of FUNCTION fails - bug #1919808 [operations] Renaming a database fails to handle functions +- bug #1934401 [core] Cannot force a language 2.11.5.1 (2008-03-29) - bug #1909711 [security] Sensitive data in session files diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php index 934ac1733..9ca4ce7db 100644 --- a/libraries/database_interface.lib.php +++ b/libraries/database_interface.lib.php @@ -848,7 +848,8 @@ function PMA_DBI_postConnect($link, $is_controluser = false) } // and we remove the non-UTF-8 choices to avoid confusion - if (!defined('PMA_REMOVED_NON_UTF_8')) { + // (unless there is a forced language) + if (!defined('PMA_REMOVED_NON_UTF_8') && ! isset($GLOBALS['cfg']['Lang'])) { foreach ($GLOBALS['available_languages'] as $each_lang => $dummy) { if (substr($each_lang, -5) != 'utf-8') { unset($GLOBALS['available_languages'][$each_lang]);