adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 03:18:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

add a space after the comma in the $merge array

Browse source
This commit is contained in:
Fitorec 2011-12-06 18:04:11 -06:00
parent 22ad6cdca5
commit c8326460a4
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -675,7 +675,7 @@ class Model extends Object {
}
if (is_subclass_of($this, 'AppModel')) {
$merge = array('actsAs','findMethods');
$merge = array('actsAs', 'findMethods');
$parentClass = get_parent_class($this);
if ($parentClass !== 'AppModel') {
$this->_mergeVars($merge, $parentClass);