Handle plugin association consistently

cakephp · Jul 9, 2016 · 7edcdb0 · 7edcdb0
1 parent ae42deb
commit 7edcdb0
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/lib/Cake/Model/Model.php b/lib/Cake/Model/Model.php
@@ -1035,13 +1035,13 @@ protected function _createLinks() {
 						unset($association[$assoc]);
 						$assoc = $value;
 						$value = array();
-
-						if (strpos($assoc, '.') !== false) {
-							list($plugin, $assoc) = pluginSplit($assoc, true);
-							$association[$assoc] = array('className' => $plugin . $assoc);
-						} else {
-							$association[$assoc] = $value;
-						}
+						$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);