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

Handle plugin association consistently

Browse source
This commit is contained in:
Philippe Saint-Just 2016-07-09 16:08:16 +01:00
parent ae42debeff
commit 7edcdb0799
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1035,13 +1035,13 @@ class Model extends Object implements CakeEventListener {
unset($association[$assoc]);
$assoc = $value;
$value = array();
$association[$assoc] = $value;
}
if (strpos($assoc, '.') !== false) {
list($plugin, $assoc) = pluginSplit($assoc, true);
$association[$assoc] = array('className' => $plugin . $assoc);
} else {
$association[$assoc] = $value;
}
if (!isset($value['className']) && strpos($assoc, '.') !== false) {
unset($association[$assoc]);
list($plugin, $assoc) = pluginSplit($assoc, true);
$association[$assoc] = array('className' => $plugin . $assoc) + $value;
}
$this->_generateAssociation($type, $assoc);