bug #1934401 [core] Cannot force a language

This commit is contained in:
Marc Delisle
2008-04-16 18:54:42 +00:00
parent 1638a932d2
commit 44ca7ef8f3
2 changed files with 3 additions and 1 deletions

View File

@@ -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

View File

@@ -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]);