adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-31 17:16:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into 2.4

Browse source
This commit is contained in:
mark_story 2013-03-13 21:01:03 -04:00
commit 0900c32c03
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
lib/Cake/Test/Case/View/Helper/FormHelperTest.php
View file

@ -2210,6 +2210,15 @@ class FormHelperTest extends CakeTestCase {
$this->assertContains('<option value="06" selected="selected">6</option>', $result);
$this->assertContains('<option value="15" selected="selected">15</option>', $result);
$this->assertContains('<option value="pm" selected="selected">pm</option>', $result);
$result = $this->Form->input('published', array('type' => 'time'));
$now = strtotime('now');
$this->assertContains('<option value="' . date('h', $now) . '" selected="selected">' . date('g', $now) . '</option>', $result);
$now = strtotime('2013-03-09 00:42:21');
$result = $this->Form->input('published', array('type' => 'time', 'selected' => $now));
$this->assertContains('<option value="12" selected="selected">12</option>', $result);
$this->assertContains('<option value="42" selected="selected">42</option>', $result);
}
/**
@ -5571,10 +5580,6 @@ class FormHelperTest extends CakeTestCase {
$this->assertRegExp('/<option[^<>]+value="03"[^<>]+selected="selected"[^>]*>3<\/option>/', $result);
$this->assertRegExp('/<option[^<>]+value="13"[^<>]+selected="selected"[^>]*>13<\/option>/', $result);
$this->assertRegExp('/<option[^<>]+value="35"[^<>]+selected="selected"[^>]*>35<\/option>/', $result);
$result = $this->Form->input('published', array('type' => 'time'));
$now = strtotime('now');
$this->assertContains('<option value="' . date('h', $now) . '" selected="selected">' . date('g', $now) . '</option>', $result);
}
/**

3
lib/Cake/View/Helper/FormHelper.php
View file

@ -2208,6 +2208,9 @@ class FormHelper extends AppHelper {
if ($attributes['value'] > 12 && !$format24Hours) {
$attributes['value'] -= 12;
}
if ($attributes['value'] === '00' && !$format24Hours) {
$attributes['value'] = 12;
}
return $this->select(
$fieldName . ".hour",