diff --git a/Cake/Test/TestApp/View/Posts/cache_form.ctp b/Cake/Test/TestApp/View/Posts/cache_form.ctp index 7f335e1f6d9..246d3028310 100644 --- a/Cake/Test/TestApp/View/Posts/cache_form.ctp +++ b/Cake/Test/TestApp/View/Posts/cache_form.ctp @@ -1,8 +1,8 @@
- Form->create('User'); ?> + Form->create(false); ?>
- + Form->input('username'); echo $this->Form->input('email'); @@ -11,4 +11,4 @@
Form->end('Submit'); ?> -
\ No newline at end of file + diff --git a/Cake/Test/TestCase/View/HelperTest.php b/Cake/Test/TestCase/View/HelperTest.php index 1b1b47f0445..90231aff0ae 100644 --- a/Cake/Test/TestCase/View/HelperTest.php +++ b/Cake/Test/TestCase/View/HelperTest.php @@ -496,16 +496,6 @@ public function testValueHabtmKeys() { $result = $this->Helper->value('HelperTestTag.HelperTestTag'); $this->assertEquals(array(2, 3, 4), $result); - $this->Helper->request->data = array( - 'HelperTestTag' => array( - array('id' => 3), - array('id' => 5) - ) - ); - $this->Helper->setEntity('HelperTestTag.HelperTestTag'); - $result = $this->Helper->value('HelperTestTag.HelperTestTag'); - $this->assertEquals(array(3 => 3, 5 => 5), $result); - $this->Helper->request->data = array( 'HelperTestTag' => array( 'body' => '', diff --git a/Cake/View/Helper/FormHelper.php b/Cake/View/Helper/FormHelper.php index 8bf47a8f9a3..75790773cf8 100644 --- a/Cake/View/Helper/FormHelper.php +++ b/Cake/View/Helper/FormHelper.php @@ -180,7 +180,7 @@ protected function _introspectModel($model, $key, $field = null) { } if ($key === 'key') { - return $this->fieldset[$model]['key'] = $object->primaryKey; + return $this->fieldset[$model]['key'] = $object->primaryKey(); } if ($key === 'fields') {