diff options
author | Marc Delisle <marc@infomarc.info> | 2008-07-24 22:01:10 +0400 |
---|---|---|
committer | Marc Delisle <marc@infomarc.info> | 2008-07-24 22:01:10 +0400 |
commit | 24894077527afdccff602f5453c48b4603c5e713 (patch) | |
tree | 9d919dd2ba90cb09e5ae55bcf11a7315af7af9a7 | |
parent | 6a5e53c31bcbcadcb5d16cffaa3b9af181b26296 (diff) |
revert language changing problem introduced with 2.11.7.1; version number 2.11.8-rc1RELEASE_2_11_8RC1
-rw-r--r-- | ChangeLog | 1 | ||||
-rw-r--r-- | Documentation.html | 4 | ||||
-rw-r--r-- | README | 2 | ||||
-rw-r--r-- | libraries/Config.class.php | 2 | ||||
-rw-r--r-- | libraries/common.inc.php | 2 | ||||
-rw-r--r-- | translators.html | 4 |
6 files changed, 9 insertions, 6 deletions
@@ -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/Documentation.html b/Documentation.html index 2bd1d7cf98..33330d6a8a 100644 --- a/Documentation.html +++ b/Documentation.html @@ -11,7 +11,7 @@ <link rel="icon" href="./favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" /> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> - <title>phpMyAdmin 2.11.8-dev - Documentation</title> + <title>phpMyAdmin 2.11.8-rc1 - Documentation</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head> @@ -33,7 +33,7 @@ <li><a href="#glossary">Glossary</a></li> </ul> -<h1>phpMyAdmin 2.11.8-dev Documentation</h1> +<h1>phpMyAdmin 2.11.8-rc1 Documentation</h1> <ul><li><a href="http://www.phpmyadmin.net/"> phpMyAdmin homepage</a></li> @@ -5,7 +5,7 @@ phpMyAdmin - Readme A set of PHP-scripts to manage MySQL over the web. - Version 2.11.8-dev + Version 2.11.8-rc1 ------------------ http://www.phpmyadmin.net/ diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 5e83e161bd..bfb01217f5 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -85,7 +85,7 @@ class PMA_Config */ function checkSystem() { - $this->set('PMA_VERSION', '2.11.8-dev'); + $this->set('PMA_VERSION', '2.11.8-rc1'); /** * @deprecated */ diff --git a/libraries/common.inc.php b/libraries/common.inc.php index 9988a4bd7e..5cc46103a9 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 */ diff --git a/translators.html b/translators.html index 9eb6097f52..eae6ea15ac 100644 --- a/translators.html +++ b/translators.html @@ -8,7 +8,7 @@ <link rel="icon" href="./favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" /> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> - <title>phpMyAdmin 2.11.8-dev - Official translators</title> + <title>phpMyAdmin 2.11.8-rc1 - Official translators</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head> @@ -31,7 +31,7 @@ <li><a href="Documentation.html#glossary">Glossary</a></li> </ul> -<h1>phpMyAdmin 2.11.8-dev official translators list</h1> +<h1>phpMyAdmin 2.11.8-rc1 official translators list</h1> <p> Here is the list of the "official translators" of phpMyAdmin.</p> |