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

[TASK] Readded group match inheritence .

Browse Source 
- Settings on routes now have higher priority when merging settings from
  group.
This commit is contained in:
Simon Sessingø
2016-03-18 17:43:57 +01:00
parent 6d8e95fcaa
commit 5483ffe458
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Pecee/SimpleRouter/RouterEntry.php
+1 -5
View File
@@ -192,10 +192,6 @@ abstract class RouterEntry {
unset($settings['prefix']);
}
if(isset($settings['regexMatch'])) {
unset($settings['regexMatch']);
}
return $settings;
}
@@ -205,7 +201,7 @@ abstract class RouterEntry {
*/
public function addSettings(array $settings = null) {
if(is_array($settings)) {
$this->settings = array_merge($this->settings, $settings);
$this->settings = array_merge($settings, $this->settings);
}
return $this;
}