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

Make sure parameter-modifier is found before parsing parameters.

Browse Source
This commit is contained in:
Simon Sessingø
2016-11-24 10:04:47 +01:00
parent 9418d54c8e
commit ff1f027bda
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Pecee/SimpleRouter/Route/LoadableRoute.php
+10 -5
View File
@@ -48,14 +48,19 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
public function setUrl($url) public function setUrl($url)
{ {
$this->url = ($url === '/') ? '/' : '/' . trim($url, '/') . '/'; $this->url = ($url === '/') ? '/' : '/' . trim($url, '/') . '/';
$regex = sprintf(static::PARAMETERS_REGEX_MATCH, $this->paramModifiers[0], $this->paramOptionalSymbol, $this->paramModifiers[1]);
if (preg_match_all('/' . $regex . '/is', $this->url, $matches)) { if(strpos($this->url, $this->paramModifiers[0]) !== false) {
$max = count($matches[1]); $regex = sprintf(static::PARAMETERS_REGEX_MATCH, $this->paramModifiers[0], $this->paramOptionalSymbol, $this->paramModifiers[1]);
if (preg_match_all('/' . $regex . '/is', $this->url, $matches)) {
$max = count($matches[1]);
for ($i = 0; $i < $max; $i++) {
$this->parameters[$matches[1][$i]] = null;
}
for($i = 0; $i < $max; $i++) {
$this->parameters[$matches[1][$i]] = null;
} }
} }