From c7dd098be1dcec28949dad78dc2111f8413d0ce9 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Fri, 26 Sep 2008 16:22:42 +0000 Subject: [PATCH] bug #114066 [core] ForceSSL generates incorrectly escaped redirections --- ChangeLog | 1 + libraries/common.inc.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 481f951b1..52d20863b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -88,6 +88,7 @@ danbarry + [lang] Hungarian update, thanks to Jozsef Tamas Herczeg - dodika - bug #2113848 [navi] Page number after database switching - patch #2115966 [GUI] Checkboxes and IE 7, thanks to Martin - maschg +- bug #114066 [core] ForceSSL generates incorrectly escaped redirections 2.11.9.2 (2008-09-22) - [security] XSS in MSIE using NUL byte, thanks to JPCERT. diff --git a/libraries/common.inc.php b/libraries/common.inc.php index 9a79a73ba..b00b3df79 100644 --- a/libraries/common.inc.php +++ b/libraries/common.inc.php @@ -534,7 +534,7 @@ if ($_SESSION['PMA_Config']->get('ForceSSL') PMA_sendHeaderLocation( preg_replace('/^http/', 'https', $_SESSION['PMA_Config']->get('PmaAbsoluteUri')) - . PMA_generate_common_url($_GET)); + . PMA_generate_common_url($_GET, '', '&')); exit; }