Added var $link to set_url_var so we correctly can set the new uri with

& if it concerns a link or & when it concerns a header redirect.

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

diff --git a/functions/html.php b/functions/html.php
index 62bcafcf13899962058621378416d1afee2ed26d..b926f736960cc7cceb57e4a5f828fd22134a4d9c 100644 (file)
--- a/functions/html.php
+++ b/functions/html.php
@@ -79,7 +79,7 @@
 
     /* handy function to set url vars */
     /* especially usefull when $url = $PHP_SELF */
-    function set_url_var($url, $var, $val=0) {
+    function set_url_var($url, $var, $val=0, $link=true) {
         $k = '';
         $ret = '';
         $pat_a = array (
@@ -88,7 +88,7 @@
                        '/.+(\\?'.$var.')=(.*)$/AU',     /* at front and only var */
                        '/.+(\\&'.$var.')=(.*)$/AU'      /* at the end */
                      );
-//     preg_replace('/&/','&',$url);            
+       preg_replace('/&/','&',$url);            
         switch (true) {
             case (preg_match($pat_a[0],$url,$regs)):
                 $k = $regs[1];
@@ -120,7 +120,9 @@
         if ($k) {
             if ($val) {
                 $rpl = "$k=$val";
-//             $rpl = preg_replace('/&/','&',$rpl);
+               if ($link) {
+                   $rpl = preg_replace('/&/','&',$rpl);
+               }
             } else {
                 $rpl = '';
             }