From 438d3c258b1702d6407470cf3b36ba3e37cda729 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20Sessing=C3=B8?= Date: Sat, 19 Mar 2016 17:11:54 +0100 Subject: [PATCH] [TASK] Readded merging --- src/Pecee/SimpleRouter/RouterEntry.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Pecee/SimpleRouter/RouterEntry.php b/src/Pecee/SimpleRouter/RouterEntry.php index e969350..87e6b9f 100644 --- a/src/Pecee/SimpleRouter/RouterEntry.php +++ b/src/Pecee/SimpleRouter/RouterEntry.php @@ -202,7 +202,7 @@ abstract class RouterEntry { */ public function addSettings(array $settings = null) { if(is_array($settings)) { - $this->settings = array_merge($settings, $this->settings); + $this->settings = array_merge($this->settings, $settings); } return $this; }