Need to retain protected method that does this

horde · Feb 11, 2014 · b9e23eb · b9e23eb
1 parent 89a3321
commit b9e23eb
Showing 1 changed file with 19 additions and 9 deletions.
diff --git a/framework/Url/lib/Horde/Url.php b/framework/Url/lib/Horde/Url.php
@@ -271,6 +271,24 @@ public function toString($raw = false, $full = true)
             $url .= '/' . $this->pathInfo;
         }
 
+        if ($params = $this->_getParameters()) {
+            $url .= '?' . implode($raw ? '&' : '&amp;', $params);
+        }
+
+        if ($this->anchor) {
+            $url .= '#' . ($raw ? $this->anchor : rawurlencode($this->anchor));
+        }
+
+        return strval($url);
+    }
+
+    /**
+     * Return a formatted list of URL parameters.
+     *
+     * @return array  Parameter list.
+     */
+    protected function _getParameters()
+    {
         if (!isset($this->_cache)) {
             $params = array();
 
@@ -288,15 +306,7 @@ public function toString($raw = false, $full = true)
             $this->_cache = $params;
         }
 
-        if (!empty($this->_cache)) {
-            $url .= '?' . implode($raw ? '&' : '&amp;', $this->_cache);
-        }
-
-        if ($this->anchor) {
-            $url .= '#' . ($raw ? $this->anchor : rawurlencode($this->anchor));
-        }
-
-        return strval($url);
+        return $this->_cache;
     }
 
     /**