fix for amp; stuff

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@3258 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/functions/html.php b/functions/html.php
index d49617344cb85cee6cab339d66a93e941069c592..246808e1b88c1782aacee14ef632b179c13cd12d 100644 (file)
--- a/functions/html.php
+++ b/functions/html.php
@@ -82,8 +82,6 @@
     function set_url_var($url, $var, $val=0) {
         $k = '';
         $ret = '';
-        $url = trim(preg_replace('/&/','&',$url));
-
         $pat_a = array (
                        '/.+(\\&'.$var.')=(.*)\\&/AU',   /* in the middle */
                        '/.+\\?('.$var.')=(.*\\&).+/AU', /* at front, more follow */
@@ -110,7 +108,7 @@
             default:
                 if ($val) {
                     if (strpos($url,'?')) {
-                        $url .= "&$var=$val";
+                        $url .= "&$var=$val";
                     } else {
                         $url .= "?$var=$val";
                     }
@@ -121,13 +119,14 @@
         if ($k) {
             if ($val) {
                 $rpl = "$k=$val";
+               $rpl = preg_replace('/&/','&',$rpl);
             } else {
                 $rpl = '';
             }
             $pat = "/$k=$v/";
             $url = preg_replace($pat,$rpl,$url);
         }
-        return  preg_replace('/&/','&',$url);
+        return $url;
     }
 
     /* Temporary test function to proces template vars with formatting.