Skip to content
Permalink
Browse files

Fix discrepancy in Model::field when Model::id is null

When using ClassRegistry::init for instance
  • Loading branch information...
tersmitten committed Jun 8, 2017
1 parent 77b7ccf commit ddbdf170e6c7cb3fe574a485cd8ba8c67a5c3f9e
Showing with 7 additions and 1 deletion.
  1. +1 −1 lib/Cake/Model/Model.php
  2. +6 −0 lib/Cake/Test/Case/Model/ModelReadTest.php
@@ -1653,7 +1653,7 @@ public function read($fields = null, $id = null) {
* @link http://book.cakephp.org/2.0/en/models/retrieving-your-data.html#model-field
*/
public function field($name, $conditions = null, $order = null) {
if ($conditions === null && $this->id !== false) {
if ($conditions === null && !in_array($this->id, [false, null], true)) {
$conditions = array($this->alias . '.' . $this->primaryKey => $this->id);
}
@@ -7041,6 +7041,12 @@ public function testFindField() {
$result = $TestModel->field('COUNT(*)', true);
$this->assertEquals(4, $result);
$TestModel->id = null;
$result = $TestModel->field('user', array(
'user' => 'mariano'
));
$this->assertEquals('mariano', $result);
}
/**

0 comments on commit ddbdf17

Please sign in to comment.
You can’t perform that action at this time.