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

diff --git a/ChangeLog b/ChangeLog
index 67b318de62b941d9c7595af2b90ea411f3f44781..c5c499779e5110ba378e10796084305817b6e2d1 100644 (file)
--- 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 8667427a9aaa2bc37a77ebd17aa0731131ac1b6f..11cca6f7acd54547b503daad03754b4c0a1cd820 100644 (file)
--- 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);
         }