Fix issue with duplicate associations when using string form.

Fixes #2002
cakephp · Sep 18, 2011 · 8d43764 · 8d43764
1 parent 6a4e755
commit 8d43764
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/lib/Cake/Model/Model.php b/lib/Cake/Model/Model.php
@@ -903,11 +903,12 @@ protected function _createLinks() {
 						unset ($this->{$type}[$assoc]);
 						$assoc = $value;
 						$value = array();
-						$this->{$type}[$assoc] = $value;
 
 						if (strpos($assoc, '.') !== false) {
 							list($plugin, $assoc) = pluginSplit($assoc);
 							$this->{$type}[$assoc] = array('className' => $plugin. '.' . $assoc);
+						} else {
+							$this->{$type}[$assoc] = $value;
 						}
 					}
 					$this->_generateAssociation($type, $assoc);

diff --git a/lib/Cake/Test/Case/Model/ModelIntegrationTest.php b/lib/Cake/Test/Case/Model/ModelIntegrationTest.php
@@ -1289,6 +1289,20 @@ public function testAutoConstructAssociations() {
 		$this->assertEqual($TestFakeModel->Tag->name, 'Tag');
 	}
 
+/**
+ * test creating associations with plugins. Ensure a double alias isn't created
+ *
+ * @return void
+ */
+	public function testAutoConstructPluginAssociations() {
+		$Comment = ClassRegistry::init('TestPluginComment');
+
+		$this->assertEquals(2, count($Comment->belongsTo), 'Too many associations');
+		$this->assertFalse(isset($Comment->belongsTo['TestPlugin.User']));
+		$this->assertTrue(isset($Comment->belongsTo['User']), 'Missing association');
+		$this->assertTrue(isset($Comment->belongsTo['TestPluginArticle']), 'Missing association');
+	}
+
 /**
  * test Model::__construct
  *

diff --git a/lib/Cake/Test/Case/Model/models.php b/lib/Cake/Test/Case/Model/models.php
@@ -2709,7 +2709,7 @@ class TestPluginComment extends CakeTestModel {
 			'className' => 'TestPlugin.TestPluginArticle',
 			'foreignKey' => 'article_id',
 		),
-		'User'
+		'TestPlugin.User'
 	);
 }