From a56294f2750f43fa337ff81401c3f4dcb0ee5321 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Thu, 24 Jul 2008 18:01:10 +0000 Subject: [PATCH] revert language changing problem introduced with 2.11.7.1; version number 2.11.8-rc1 --- ChangeLog | 1 + libraries/common.inc.php | 2 ++ 2 files changed, 3 insertions(+) diff --git a/ChangeLog b/ChangeLog index d9da6a2d3..6c930cbd0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -29,6 +29,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA - [security] protection against cross-frame scripting and new directive AllowThirdPartyFraming, thanks to YGN Ethical Hacker Group - [security] possible XSS during setup, thanks to YGN Ethical Hacker Group +- [interface] revert language changing problem introduced with 2.11.7.1 2.11.7.1 (2008-07-15) - bug [security] XSRF/CSRF by manipulating the db, diff --git a/libraries/common.inc.php b/libraries/common.inc.php index 9988a4bd7..5cc46103a 100644 --- a/libraries/common.inc.php +++ b/libraries/common.inc.php @@ -402,6 +402,8 @@ if (! PMA_isValid($_REQUEST['token']) || $_SESSION[' PMA_token '] != $_REQUEST[' * also, server needed for cookie login screen (multi-server) */ 'server', 'db', 'table', 'target', + /* to change the language on login screen or main page */ + lang, /* Session ID */ 'phpMyAdmin', /* Cookie preferences */