Fixing formHelper::hour when specifying a strtotime compatible string…

… for the selected value. Tests added Fixes #5941 git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7967 3807eeeb-6ff5-0310-8944-8be069107fe0
cakephp · Dec 30, 2008 · 79c7915 · 79c7915
1 parent 94b9bca
commit 79c7915
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/cake/libs/view/helpers/form.php b/cake/libs/view/helpers/form.php
@@ -1364,6 +1364,8 @@ function hour($fieldName, $format24Hours = false, $selected = null, $attributes
 					$selected = $value;
 				}
 			}
+		} else {
+			$value = $selected;
 		}
 
 		if (strlen($selected) > 2) {

diff --git a/cake/tests/cases/libs/view/helpers/form.test.php b/cake/tests/cases/libs/view/helpers/form.test.php
@@ -3997,6 +3997,11 @@ function testHour() {
 			'/select',
 		);
 		$this->assertTags($result, $expected);
+
+		unset($this->Form->data['Model']['field']);
+		$result = $this->Form->hour('Model.field', true, 'now');
+		$thisHour = date('H');
+		$this->assertPattern('/<option value="' . $thisHour . '" selected="selected">'. $thisHour .'<\/option>/', $result);
 	}
 /**
  * testYear method