From c4bff83ac4fbdbcb78a979cc7f1a34a6abcfcab4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20Sessing=C3=B8?= Date: Sat, 21 Nov 2015 21:00:15 +0100 Subject: [PATCH] [BUGFIX] Fixed route not matching when two params added next to each other. --- src/Pecee/SimpleRouter/RouterRoute.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Pecee/SimpleRouter/RouterRoute.php b/src/Pecee/SimpleRouter/RouterRoute.php index 3abcf27..cf541e5 100644 --- a/src/Pecee/SimpleRouter/RouterRoute.php +++ b/src/Pecee/SimpleRouter/RouterRoute.php @@ -63,7 +63,7 @@ class RouterRoute extends RouterEntry { // Check for optional parameter if($lastCharacter === '?') { $parameter = substr($parameter, 0, strlen($parameter)-1); - $regex .= '(?:(?:\/(?P<'.$parameter.'>[a-z0-9]*?)){0,1}\\/)'; + $regex .= '(?:(?:\/{0,1}(?P<'.$parameter.'>[a-z0-9]*?)){0,1}\\/)'; } else { // Use custom parameter regex if it exists $parameterRegex = '[a-z0-9]*?'; @@ -72,7 +72,7 @@ class RouterRoute extends RouterEntry { $parameterRegex = $this->parametersRegex[$parameter]; } - $regex .= '(?:\\/(?P<' . $parameter . '>'. $parameterRegex .')\\/)'; + $regex .= '(?:\\/{0,1}(?P<' . $parameter . '>'. $parameterRegex .')\\/)'; } $parameterNames[] = $parameter; $parameter = '';