geckon01/simple-php-router
1
0
Fork 0
mirror of https://github.com/skipperbent/simple-php-router.git synced 2026-06-17 08:47:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #37 from skipperbent/development

Browse Source 
Fixed route not matching when two params added next to each other.
This commit is contained in:
Simon Sessingø
2015-11-21 21:02:04 +01:00
parent 6e98f8e20b 866832faa6
commit 5a398f03a6
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Pecee/SimpleRouter/RouterRoute.php
+2 -2
View File
@@ -63,7 +63,7 @@ class RouterRoute extends RouterEntry {
// Check for optional parameter // Check for optional parameter
if($lastCharacter === '?') { if($lastCharacter === '?') {
$parameter = substr($parameter, 0, strlen($parameter)-1); $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 { } else {
// Use custom parameter regex if it exists // Use custom parameter regex if it exists
$parameterRegex = '[a-z0-9]*?'; $parameterRegex = '[a-z0-9]*?';
@@ -72,7 +72,7 @@ class RouterRoute extends RouterEntry {
$parameterRegex = $this->parametersRegex[$parameter]; $parameterRegex = $this->parametersRegex[$parameter];
} }
$regex .= '(?:\\/(?P<' . $parameter . '>'. $parameterRegex .')\\/)'; $regex .= '(?:\\/{0,1}(?P<' . $parameter . '>'. $parameterRegex .')\\/)';
} }
$parameterNames[] = $parameter; $parameterNames[] = $parameter;
$parameter = ''; $parameter = '';