Merge pull request #12 from midahp/horde_FRAMEWORK_6_0

fix smartmobile link generation
horde · Mar 28, 2024 · 24f4306 · 24f4306
2 parents 37dcb14 + 3db9e0a
commit 24f4306
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/lib/Horde/Core/Smartmobile/Url.php b/lib/Horde/Core/Smartmobile/Url.php
@@ -79,8 +79,10 @@ public function toString($raw = false, $full = true)
     {
         if ($this->toStringCallback || !strlen($this->anchor)) {
             $baseUrl = $this->_baseUrl->copy();
-            $baseUrl->parameters = array_merge($baseUrl->parameters,
-                                               $this->parameters);
+            $baseUrl->parameters = array_merge(
+                $baseUrl->parameters,
+                $this->parameters
+            );
             if (strlen($this->pathInfo)) {
                 $baseUrl->pathInfo = $this->pathInfo;
             }
@@ -98,8 +100,8 @@ public function toString($raw = false, $full = true)
             $url .= '#' . ($raw ? $this->anchor : rawurlencode($this->anchor));
         }
 
-        if ($params = $this->_getParameters()) {
-            $url .= '?' . implode($raw ? '&' : '&amp;', $params);
+        if ($params = $this->parameters) {
+            $url .= '?' . http_build_query($params, '', $raw ? '&' : '&amp;');
         }
 
         return strval($url);