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

Fix issue with array based values and interval.

Browse source 
Fixes #3299
This commit is contained in:
mark_story 2012-10-25 20:46:54 -04:00
parent e6512c56fd
commit c359e4b689
2 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2235,6 +2235,15 @@ class FormHelperTest extends CakeTestCase {
* @return void
*/
public function testTimeSelectedWithInterval() {
$result = $this->Form->input('Model.start_time', array(
'type' => 'time',
'interval' => 15,
'selected' => array('hour' => '3', 'min' => '57', 'meridian' => 'pm')
));
$this->assertContains('<option value="04" selected="selected">4</option>', $result);
$this->assertContains('<option value="00" selected="selected">00</option>', $result);
$this->assertContains('<option value="pm" selected="selected">pm</option>', $result);
$result = $this->Form->input('Model.start_time', array(
'type' => 'time',
'interval' => 15,

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

@ -2197,6 +2197,9 @@ class FormHelper extends AppHelper {
if (!empty($attributes['value'])) {
if (is_array($attributes['value'])) {
extract($attributes['value']);
if ($meridian === 'pm') {
$hour += 12;
}
} else {
if (is_numeric($attributes['value'])) {
$attributes['value'] = strftime('%Y-%m-%d %H:%M:%S', $attributes['value']);