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 #75 from skipperbent/development

Browse Source 
[TASK] Readded merging
This commit is contained in:
Simon Sessingø
2016-03-19 17:40:26 +01:00
parent ae58231fa1 438d3c258b
commit 212ae133de
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Pecee/SimpleRouter/RouterEntry.php
+1 -1
View File
@@ -202,7 +202,7 @@ abstract class RouterEntry {
*/ */
public function addSettings(array $settings = null) { public function addSettings(array $settings = null) {
if(is_array($settings)) { if(is_array($settings)) {
$this->settings = array_merge($settings, $this->settings); $this->settings = array_merge($this->settings, $settings);
} }
return $this; return $this;
} }