adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-09-08 20:42:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

microptimize options and default merge and other string key array merges

Browse source
This commit is contained in:
euromark 2014-04-08 01:25:14 +02:00
parent 8d47ef43e5
commit 0ece694a75
35 changed files with 121 additions and 133 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/Cake/View/Helper.php
View file

@ -201,7 +201,7 @@ class Helper extends Object {
*/
public function __get($name) {
if (isset($this->_helperMap[$name]) && !isset($this->{$name})) {
$settings = array_merge((array)$this->_helperMap[$name]['settings'], array('enabled' => false));
$settings = array('enabled' => false) + (array)$this->_helperMap[$name]['settings'];
$this->{$name} = $this->_View->loadHelper($this->_helperMap[$name]['class'], $settings);
}
if (isset($this->{$name})) {