From ad1ce21c66452400ee9ed0278a01a180fbad919f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20Sessing=C3=B8?= <simon.sessingoe@gmail.com>
Date: Sat, 12 Dec 2015 20:42:06 +0100
Subject: [PATCH 1/3] [BUGFIX] Fixed getParams not being passed when using
 getRoute on current route.

---
 src/Pecee/SimpleRouter/RouterBase.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Pecee/SimpleRouter/RouterBase.php b/src/Pecee/SimpleRouter/RouterBase.php
index bd94efb..97c861c 100644
--- a/src/Pecee/SimpleRouter/RouterBase.php
+++ b/src/Pecee/SimpleRouter/RouterBase.php
@@ -281,7 +281,7 @@ class RouterBase {
         }
 
         if($controller === null && $parameters === null && $this->loadedRoute !== null) {
-            return $this->processUrl($this->loadedRoute, null, $getParams);
+            return $this->processUrl($this->loadedRoute, null, null, $getParams);
         }
 
         $c = '';

From c67ab20ddd28a6e728d273ab29865a629b00e0fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20Sessing=C3=B8?= <simon.sessingoe@gmail.com>
Date: Sat, 12 Dec 2015 22:53:25 +0100
Subject: [PATCH 2/3] [BUGFIX] Merge current parameters with new provided ones.

---
 src/Pecee/SimpleRouter/RouterBase.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Pecee/SimpleRouter/RouterBase.php b/src/Pecee/SimpleRouter/RouterBase.php
index 97c861c..f1c3e5d 100644
--- a/src/Pecee/SimpleRouter/RouterBase.php
+++ b/src/Pecee/SimpleRouter/RouterBase.php
@@ -281,6 +281,7 @@ class RouterBase {
         }
 
         if($controller === null && $parameters === null && $this->loadedRoute !== null) {
+            $getParams = (is_array($getParams)) ? array_merge($_GET, $getParams) : $_GET;
             return $this->processUrl($this->loadedRoute, null, null, $getParams);
         }
 

From 4f07f38cf58bf95886ffa3ee539ee291ba980aae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20Sessing=C3=B8?= <simon.sessingoe@gmail.com>
Date: Sat, 12 Dec 2015 23:38:48 +0100
Subject: [PATCH 3/3] [BUGFIX] Fixed getting current route not always returning
 current url.

---
 src/Pecee/SimpleRouter/RouterBase.php | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/Pecee/SimpleRouter/RouterBase.php b/src/Pecee/SimpleRouter/RouterBase.php
index f1c3e5d..8247130 100644
--- a/src/Pecee/SimpleRouter/RouterBase.php
+++ b/src/Pecee/SimpleRouter/RouterBase.php
@@ -280,9 +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) {
             $getParams = (is_array($getParams)) ? array_merge($_GET, $getParams) : $_GET;
-            return $this->processUrl($this->loadedRoute, null, null, $getParams);
+
+            $url = parse_url(Request::getInstance()->getUri());
+            $url = $url['path'];
+
+            if(count($getParams)) {
+                $url .= '?' . $this->arrayToParams($getParams);
+            }
+
+            return $url;
         }
 
         $c = '';