From 6c359ab4303ce67243fbaa8b3eeb3cf3ba61ae83 Mon Sep 17 00:00:00 2001
From: stekkel <stekkel@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Mon, 16 Sep 2002 17:05:35 +0000
Subject: [PATCH] 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
---
 functions/html.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/functions/html.php b/functions/html.php
index 246808e1..62bcafcf 100644
--- a/functions/html.php
+++ b/functions/html.php
@@ -88,6 +88,7 @@
                        '/.+(\\?'.$var.')=(.*)$/AU',     /* at front and only var */
                        '/.+(\\&'.$var.')=(.*)$/AU'      /* at the end */
                      );
+//	preg_replace('/&amp;/','&',$url);	     
         switch (true) {
             case (preg_match($pat_a[0],$url,$regs)):
                 $k = $regs[1];
@@ -108,7 +109,7 @@
             default:
                 if ($val) {
                     if (strpos($url,'?')) {
-                        $url .= "&amp;$var=$val";
+                        $url .= "&$var=$val";
                     } else {
                         $url .= "?$var=$val";
                     }
@@ -119,7 +120,7 @@
         if ($k) {
             if ($val) {
                 $rpl = "$k=$val";
-		$rpl = preg_replace('/&/','&amp;',$rpl);
+//		$rpl = preg_replace('/&/','&amp;',$rpl);
             } else {
                 $rpl = '';
             }
-- 
2.25.1