From a9551b7f72ad8aac30b112658273035bf6dd4190 Mon Sep 17 00:00:00 2001 From: kink Date: Sun, 21 Nov 2004 14:56:11 +0000 Subject: [PATCH] set_url_var would eat the "&" if the first url var was being changed. Fixes #1053725 git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@8390 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- ChangeLog | 7 ++++--- functions/html.php | 3 +++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 67b318de..c5c49977 100644 --- a/ChangeLog +++ b/ChangeLog @@ -155,11 +155,12 @@ Version 1.5.1 -- CVS - LDAP backend will use internal squirrelmail charset conversion functions instead of php xml extension. Fixes bug #655137. - Added Wood theme and Silver Steel theme by Pavel Spatny and Simple Green theme - - Fix two time zone calculation bugs, thanks to David White + - Fix two time zone calculation bugs, thanks to David White. Fixes #1063879. - 'Priority' and 'Importance' headers are now also recognised, next to the - 'X-Priority' header that we've supported since a long time. + 'X-Priority' header that we've supported since a long time. Fixes #1039935. - Handle a reload of the signout page gracefully: do not present an error - about having to be logged in to be able to sign out. + about having to be logged in to be able to sign out. Fixes #1070069. + - Prevent & being eaten in set_url_var, thanks Marcin Orlowski. Fixes #1053725. Version 1.5.0 -------------------- diff --git a/functions/html.php b/functions/html.php index 8667427a..11cca6f7 100644 --- a/functions/html.php +++ b/functions/html.php @@ -137,6 +137,9 @@ function html_tag( $tag, // Tag to output } else { $rpl = ''; } + if( substr($v,-1)=='&' ) { + $rpl .= '&'; + } $pat = "/$k=$v/"; $url = preg_replace($pat,$rpl,$url); } -- 2.25.1