Don't assume that url parameters have an equal sign.

diff --git a/framework/Url/lib/Horde/Url.php b/framework/Url/lib/Horde/Url.php
index f028f71..9652dff 100644 (file)
--- a/framework/Url/lib/Horde/Url.php
+++ b/framework/Url/lib/Horde/Url.php
@@ -80,12 +80,12 @@ class Horde_Url
 
             /* Check if the argument separator has been already
              * htmlentities-ized in the URL. */
-            if (preg_match('/=.*?&.*?=/', $query)) {
+            if (preg_match('/&/', $query)) {
                 $query = html_entity_decode($query);
                 if (is_null($raw)) {
                     $raw = false;
                 }
-            } elseif (preg_match('/=.*?&.*?=/', $query)) {
+            } elseif (preg_match('/&/', $query)) {
                 if (is_null($raw)) {
                     $raw = true;
                 }