The branch, master has been updated
via 3535dcfec3274307371f83dba4cc9ea1579b3b78 (commit)
via 3fa0b1f639b76c8629a0714d0442983d4c9f4030 (commit)
via b4e7f0a6eabcd79d00e5bbcfee85f45d00d4a09f (commit)
via 3e6f8cc52cbbbe2589e47c42ac21c847a4e6f45f (commit)
from cb1b6e3059cdbf276c4d0982ab886c53420e1ad6 (commit)
- Log -----------------------------------------------------------------
commit 3535dcfec3274307371f83dba4cc9ea1579b3b78
Merge: b4e7f0a 3fa0b1f
Author: Michal Čihař <mcihar(a)suse.cz>
Date: Tue Oct 18 11:53:40 2011 +0200
Merge remote-tracking branch 'origin/QA_3_4'
commit b4e7f0a6eabcd79d00e5bbcfee85f45d00d4a09f
Merge: cb1b6e3 3e6f8cc
Author: Michal Čihař <mcihar(a)suse.cz>
Date: Tue Oct 18 11:50:29 2011 +0200
Merge remote-tracking branch 'origin/QA_3_4'
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 1 +
libraries/common.inc.php | 2 +-
2 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index d897f63..9c2e933 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -59,6 +59,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 65d63d4..4a81f14 100644
--- a/libraries/common.inc.php
+++ b/libraries/common.inc.php
@@ -469,7 +469,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
Show replies by date