[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_6-19-g3fa0b1f

The branch, QA_3_4 has been updated via 3fa0b1f639b76c8629a0714d0442983d4c9f4030 (commit) from 3e6f8cc52cbbbe2589e47c42ac21c847a4e6f45f (commit) - Log ----------------------------------------------------------------- commit 3fa0b1f639b76c8629a0714d0442983d4c9f4030 Author: Michal Čihař <mcihar(a)suse.cz> Date: Tue Oct 18 11:51:24 2011 +0200 [core] Allow to set language in URL ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/common.inc.php | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index ee79c35..279d08a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,7 @@ phpMyAdmin - ChangeLog - bug [navi] Wrong icon for view (MySQL 5.5) - bug #3420229 [doc] Missing documentation section - bug #3423725 [pdf] Broken PDF file when exporting database to PDF +- [core] Allow to set language in URL 3.4.6.0 (2011-10-16) - patch #3404173 InnoDB comment display with tooltips/aliases diff --git a/libraries/common.inc.php b/libraries/common.inc.php index 7d71993..b695022 100644 --- a/libraries/common.inc.php +++ b/libraries/common.inc.php @@ -466,7 +466,7 @@ if (! PMA_isValid($_REQUEST['token']) || $_SESSION[' PMA_token '] != $_REQUEST[' /* needed for direct access, see FAQ 1.34 * also, server needed for cookie login screen (multi-server) */ - 'server', 'db', 'table', 'target', + 'server', 'db', 'table', 'target', 'lang', /* Session ID */ 'phpMyAdmin', /* Cookie preferences */ hooks/post-receive -- phpMyAdmin