The branch, master has been updated
via a164ce48e564634a3d576df9ba43199f1ccfff5a (commit)
from 764a808e1a919acb511b651a4e72d8da06783cd6 (commit)
- Log -----------------------------------------------------------------
commit a164ce48e564634a3d576df9ba43199f1ccfff5a
Author: Michal Čihař <mcihar(a)novell.com>
Date: Fri Apr 2 11:52:25 2010 +0200
Fix error handling for language from cookie.
-----------------------------------------------------------------------
Summary of changes:
libraries/select_lang.lib.php | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/libraries/select_lang.lib.php b/libraries/select_lang.lib.php
index 4c16df7..9f026de 100644
--- a/libraries/select_lang.lib.php
+++ b/libraries/select_lang.lib.php
@@ -68,9 +68,9 @@ function PMA_langCheck()
if (! empty($_COOKIE['pma_lang'])) {
if (PMA_langSet($_COOKIE['pma_lang'])) {
return true;
- } elseif (!is_string($_COOKIE['lang'])) {
+ } elseif (!is_string($_COOKIE['pma_lang'])) {
/* Faked request, don't care on localisation */
- $GLOBALS['lang_failed_request'] = 'Yes';
+ $GLOBALS['lang_failed_cookie'] = 'Yes';
} else {
$GLOBALS['lang_failed_cookie'] = $_COOKIE['pma_lang'];
}
hooks/post-receive
--
phpMyAdmin
Show replies by date