From 79c791548ffe500745851b96f79350b7091d6222 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Tue, 30 Dec 2008 16:20:38 +0000
Subject: [PATCH] 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
---
 cake/libs/view/helpers/form.php                  | 2 ++
 cake/tests/cases/libs/view/helpers/form.test.php | 5 +++++
 2 files changed, 7 insertions(+)

diff --git a/cake/libs/view/helpers/form.php b/cake/libs/view/helpers/form.php
index 6acac503ed1..604f4823dda 100644
--- 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
index 6ba46b91efa..030df2168a7 100644
--- 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