Merge pull request #169 from skipperbent/v2-development

Fixed // on currentRoute urls.
2026-06-23 19:49:15 +00:00 · 2016-11-21 05:27:53 +02:00 · 2016-11-21 04:27:06 +01:00
1 changed files with 2 additions and 3 deletions
@@ -396,7 +396,7 @@ class Router

 		/* Return current route if no options has been specified */
 		if ($name === null && $parameters === null) {
-			return '/' . trim(parse_url($this->request->getUri(), PHP_URL_PATH), '/') . '/' . $this->arrayToParams($getParams);
+			return '/' . trim(parse_url($this->request->getUri(), PHP_URL_PATH), '/') . $this->arrayToParams($getParams);
 		}

 		/* If nothing is defined and a route is loaded we use that */
@@ -434,8 +434,7 @@ class Router
 		}

 		/* No result so we assume that someone is using a hardcoded url and join everything together. */
-
-		return '/' . trim(join('/', array_merge((array)$name, (array)$parameters)), '/') . '/' . $this->arrayToParams($getParams);
+		return '/' . trim(join('/', array_merge((array)$name, (array)$parameters)), '/') . $this->arrayToParams($getParams);
 	}

 	/**
Author	SHA1	Message	Date
Simon Sessingø	7e7319de06	Merge pull request #169 from skipperbent/v2-development Fixed // on currentRoute urls.	2016-11-21 05:27:53 +02:00
Simon Sessingø	5ad7dcf9fd	Fixed // on currentRoute urls.	2016-11-21 04:27:06 +01:00