adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 11:28:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch '1.3' of git://github.com/cakephp/cakephp into 1.3

Browse source
This commit is contained in:
Ceeram 2011-03-03 17:22:58 +01:00
commit 87c659d653
2 changed files with 27 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cake/libs/view/helpers/form.php
View file

@ -363,10 +363,6 @@ class FormHelper extends AppHelper {
unset($options['label']); unset($options['label']);
} }
$submitOptions = $options; $submitOptions = $options;
if (!$submit) {
$submit = __('Submit', true);
}
} }
$out .= $this->submit($submit, $submitOptions); $out .= $this->submit($submit, $submitOptions);
} }
@ -1309,7 +1305,7 @@ class FormHelper extends AppHelper {
* @link http://book.cakephp.org/view/1431/submit * @link http://book.cakephp.org/view/1431/submit
*/ */
function submit($caption = null, $options = array()) { function submit($caption = null, $options = array()) {
if (!$caption) { if (!is_string($caption) && empty($caption)) {
$caption = __('Submit', true); $caption = __('Submit', true);
} }
$out = null; $out = null;

26
cake/tests/cases/libs/view/helpers/form.test.php
View file

@ -5284,6 +5284,14 @@ class FormHelperTest extends CakeTestCase {
* @return void * @return void
*/ */
function testSubmitButton() { function testSubmitButton() {
$result = $this->Form->submit('');
$expected = array(
'div' => array('class' => 'submit'),
'input' => array('type' => 'submit', 'value' => ''),
'/div'
);
$this->assertTags($result, $expected);
$result = $this->Form->submit('Test Submit'); $result = $this->Form->submit('Test Submit');
$expected = array( $expected = array(
'div' => array('class' => 'submit'), 'div' => array('class' => 'submit'),
@ -6333,6 +6341,24 @@ class FormHelperTest extends CakeTestCase {
function testFormEnd() { function testFormEnd() {
$this->assertEqual($this->Form->end(), '</form>'); $this->assertEqual($this->Form->end(), '</form>');
$result = $this->Form->end('');
$expected = array(
'div' => array('class' => 'submit'),
'input' => array('type' => 'submit', 'value' => ''),
'/div',
'/form'
);
$this->assertTags($result, $expected);
$result = $this->Form->end(array('label' => ''));
$expected = array(
'div' => array('class' => 'submit'),
'input' => array('type' => 'submit', 'value' => ''),
'/div',
'/form'
);
$this->assertTags($result, $expected);
$result = $this->Form->end('save'); $result = $this->Form->end('save');
$expected = array( $expected = array(
'div' => array('class' => 'submit'), 'div' => array('class' => 'submit'),