Merge pull request #51 from skipperbent/development

Latest development
2026-06-17 00:37:52 +00:00 · 2015-12-13 03:07:20 +01:00
parent 5a19d6339c 4f07f38cf5
commit 669bfa0a86
1 changed files with 11 additions and 1 deletions
@@ -280,8 +280,18 @@ class RouterBase {
            throw new \InvalidArgumentException('Invalid type for getParams. Must be array or null');
        }

+        // Return current route if no options has been specified
        if($controller === null && $parameters === null && $this->loadedRoute !== null) {
-            return $this->processUrl($this->loadedRoute, null, $getParams);
+            $getParams = (is_array($getParams)) ? array_merge($_GET, $getParams) : $_GET;
+
+            $url = parse_url(Request::getInstance()->getUri());
+            $url = $url['path'];
+
+            if(count($getParams)) {
+                $url .= '?' . $this->arrayToParams($getParams);
+            }
+
+            return $url;
        }

        $c = '';