Fix entity names for associated model date fields.

Fixes #1993
cakephp · Sep 17, 2011 · 85b86cb · 85b86cb
1 parent 09e7f1d
commit 85b86cb
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/lib/Cake/Test/Case/View/HelperTest.php b/lib/Cake/Test/Case/View/HelperTest.php
@@ -285,6 +285,10 @@ public function testSetEntityScoped() {
 		$expected = array('HelperTestComment', 'id', 'time');
 		$this->assertEquals($expected, $this->Helper->entity());
 
+		$this->Helper->setEntity('HelperTestComment.created.year');
+		$expected = array('HelperTestComment', 'created', 'year');
+		$this->assertEquals($expected, $this->Helper->entity());
+
 		$this->Helper->setEntity(null);
 		$this->Helper->setEntity('ModelThatDoesntExist.field_that_doesnt_exist');
 		$expected = array('ModelThatDoesntExist', 'field_that_doesnt_exist');

diff --git a/lib/Cake/View/Helper.php b/lib/Cake/View/Helper.php
@@ -433,21 +433,20 @@ public function setEntity($entity, $setScope = false) {
 
 		// Either 'body' or 'date.month' type inputs.
 		if (
-			($count === 1 &&
-			$this->_modelScope &&
-			$setScope == false) ||
-			(in_array($lastPart, $this->_fieldSuffixes) &&
-			$this->_modelScope &&
-			$parts[0] !== $this->_modelScope)
+			($count === 1 && $this->_modelScope && $setScope == false) ||
+			(
+				$count === 2 &&
+				in_array($lastPart, $this->_fieldSuffixes) &&
+				$this->_modelScope &&
+				$parts[0] !== $this->_modelScope
+			)
 		) {
 			$entity = $this->_modelScope . '.' . $entity;
 		}
 
-		// 0.name style inputs.
+		// 0.name, 0.created.month style inputs.
 		if (
-			$count === 2 &&
-			is_numeric($parts[0]) &&
-			!is_numeric($parts[1])
+			$count >= 2 && is_numeric($parts[0]) && !is_numeric($parts[1]) && $this->_modelScope
 		) {
 			$entity = $this->_modelScope . '.' . $entity;
 		}