geckon01/simple-php-router
1
0
Fork 0
mirror of https://github.com/skipperbent/simple-php-router.git synced 2026-07-11 22:32:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #61 from skipperbent/development

Browse Source 
[BUGFIX] Fixed some ressources not working after latest update.
This commit is contained in:
Simon Sessingø
2016-01-15 09:39:28 +01:00
parent 6c675124fa bb6f56ef8c
commit 3298970798
3 changed files with 38 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Pecee/SimpleRouter/RouterEntry.php
-4
View File
@@ -178,10 +178,6 @@ abstract class RouterEntry {
public function getMergeableSettings() { public function getMergeableSettings() {
$settings = $this->settings; $settings = $this->settings;
/*if(isset($settings['middleware'])) {
unset($settings['middleware']);
}*/
if(isset($settings['prefix'])) { if(isset($settings['prefix'])) {
unset($settings['prefix']); unset($settings['prefix']);
} }
src/Pecee/SimpleRouter/RouterResource.php
-5
View File
@@ -53,8 +53,6 @@ class RouterResource extends RouterEntry {
$parameters = $this->parseParameters($route, $url, '[0-9]*?'); $parameters = $this->parseParameters($route, $url, '[0-9]*?');
if($parameters !== null) {
if(is_array($parameters)) { if(is_array($parameters)) {
$parameters = array_merge($this->parameters, $parameters); $parameters = array_merge($this->parameters, $parameters);
} }
@@ -96,9 +94,6 @@ class RouterResource extends RouterEntry {
return $this->call('index', $parameters); return $this->call('index', $parameters);
} }
return null;
}
/** /**
* @return string * @return string
*/ */
src/Pecee/SimpleRouter/RouterRoute.php
-6
View File
@@ -40,13 +40,7 @@ class RouterRoute extends RouterEntry {
$parameters = $this->parseParameters($route, $url); $parameters = $this->parseParameters($route, $url);
if($parameters !== null) { if($parameters !== null) {
//if(is_array($this->parameters)) {
// $this->parameters = array_merge($this->parameters, $parameters);
//} else {
$this->parameters = $parameters; $this->parameters = $parameters;
//}
return true; return true;
} }