Merge pull request #37 from skipperbent/development

Fixed route not matching when two params added next to each other.
Merge branch 'development' of https://github.com/skipperbent/simple-php-router into development
2026-06-24 20:19:17 +00:00 · 2015-11-21 21:02:04 +01:00 · 2015-11-21 21:01:14 +01:00 · 2015-11-21 21:00:15 +01:00 · 2015-11-21 20:49:09 +01:00
1 changed files with 2 additions and 2 deletions
@@ -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 = '';
Author	SHA1	Message	Date
Simon Sessingø	5a398f03a6	Merge pull request #37 from skipperbent/development Fixed route not matching when two params added next to each other.	2015-11-21 21:02:04 +01:00
Simon Sessingø	866832faa6	Merge branch 'development' of https://github.com/skipperbent/simple-php-router into development	2015-11-21 21:01:14 +01:00
Simon Sessingø	c4bff83ac4	[BUGFIX] Fixed route not matching when two params added next to each other.	2015-11-21 21:00:15 +01:00
Simon Sessingø	5ca8294015	Merge pull request #36 from skipperbent/master Latest master	2015-11-21 20:49:09 +01:00