Remove lookup in schema.

dereuromark · Feb 19, 2017 · 738115b · 738115b
1 parent de6c28f
commit 738115b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/src/Model/Table/Table.php b/src/Model/Table/Table.php
@@ -69,10 +69,7 @@ public function initialize(array $config) {
 			}
 		}
 
-		if (
-			$this->createdField && $this->hasField($this->createdField)
-			|| $this->modifiedField && $this->hasField($this->modifiedField)
-		) {
+		if ($this->createdField || $this->modifiedField && !$this->hasBehavior('Timestamp')) {
 			$this->addBehavior('Timestamp');
 		}
 	}

diff --git a/tests/TestCase/Model/Table/TableTest.php b/tests/TestCase/Model/Table/TableTest.php
@@ -381,7 +381,7 @@ public function testRelationShims() {
 	public function testBehaviorShims() {
 		$this->Wheels = TableRegistry::get('Wheels');
 		$behaviors = $this->Wheels->behaviors()->loaded();
-		$expected = ['Useless'];
+		$expected = ['Useless', 'Timestamp'];
 		$this->assertSame($expected, $behaviors);
 	}