[TASK] Readded merging

This commit is contained in:
Simon Sessingø
2016-03-19 17:11:54 +01:00
parent a58ec1544d
commit 438d3c258b
+1 -1
View File
@@ -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;
}