Skip to content

Commit

Permalink
Merge string key based arrays with + operator.
Browse files Browse the repository at this point in the history
  • Loading branch information
euromark committed Sep 5, 2014
1 parent b35cc28 commit 27b321c
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/Error/ErrorHandler.php
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ public function __construct($options = []) {
'trace' => false, 'trace' => false,
'exceptionRenderer' => 'Cake\Error\ExceptionRenderer', 'exceptionRenderer' => 'Cake\Error\ExceptionRenderer',
]; ];
$this->_options = array_merge($defaults, $options); $this->_options = $options + $defaults;
} }


/** /**
Expand Down

0 comments on commit 27b321c

Please sign in to comment.