somehow url vars with &amp are not picked up by PHP

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

diff --git a/functions/html.php b/functions/html.php
index 246808e..62bcafc 100644 (file)
--- a/functions/html.php
+++ b/functions/html.php
@@ -88,6 +88,7 @@
                        '/.+(\\?'.$var.')=(.*)$/AU',     /* at front and only var */
                        '/.+(\\&'.$var.')=(.*)$/AU'      /* at the end */
                      );
                        '/.+(\\?'.$var.')=(.*)$/AU',     /* at front and only var */
                        '/.+(\\&'.$var.')=(.*)$/AU'      /* at the end */
                      );

+//     preg_replace('/&/','&',$url);            

         switch (true) {
             case (preg_match($pat_a[0],$url,$regs)):
                 $k = $regs[1];
         switch (true) {
             case (preg_match($pat_a[0],$url,$regs)):
                 $k = $regs[1];


@@ -108,7 +109,7 @@
             default:
                 if ($val) {
                     if (strpos($url,'?')) {
             default:
                 if ($val) {
                     if (strpos($url,'?')) {

-                        $url .= "&$var=$val";
+                        $url .= "&$var=$val";

                     } else {
                         $url .= "?$var=$val";
                     }
                     } else {
                         $url .= "?$var=$val";
                     }


@@ -119,7 +120,7 @@
         if ($k) {
             if ($val) {
                 $rpl = "$k=$val";
         if ($k) {
             if ($val) {
                 $rpl = "$k=$val";

-               $rpl = preg_replace('/&/','&',$rpl);
+//             $rpl = preg_replace('/&/','&',$rpl);

             } else {
                 $rpl = '';
             }
             } else {
                 $rpl = '';
             }