From 2f799961404ed7fda48fbdbca15df08d15a86f0b Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Mon, 18 Mar 2013 21:38:02 -0400
Subject: [PATCH] Remove unused code and remove strict type checks.

Remove some unused code around manipulating hours. Also allow the
timeFormat option to be specified as either a string or an int. Both
types should be accepted and treated as equivalent.
---
 lib/Cake/View/Helper/FormHelper.php | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/lib/Cake/View/Helper/FormHelper.php b/lib/Cake/View/Helper/FormHelper.php
index 2bb2c54def7..e7374a40fe6 100644
--- a/lib/Cake/View/Helper/FormHelper.php
+++ b/lib/Cake/View/Helper/FormHelper.php
@@ -2383,9 +2383,6 @@ public function dateTime($fieldName, $dateFormat = 'DMY', $timeFormat = '12', $a
 				$current->setDate($year, $month, $day);
 			}
 			if ($hour !== null) {
-				if ($timeFormat === '12') {
-					$hour = date('H', strtotime("$hour:$min $meridian"));
-				}
 				$current->setTime($hour, $min);
 			}
 			$change = (round($min * (1 / $interval)) * $interval) - $min;
@@ -2511,14 +2508,14 @@ protected function _getDateTimeValue($value, $timeFormat) {
 		if (!empty($timeFormat)) {
 			$time = explode(':', $days[1]);
 
-			if ($time[0] >= '12' && $timeFormat === '12') {
+			if ($time[0] >= 12 && $timeFormat == 12) {
 				$meridian = 'pm';
-			} elseif ($time[0] === '00' && $timeFormat === '12') {
+			} elseif ($time[0] === '00' && $timeFormat == 12) {
 				$time[0] = 12;
 			} elseif ($time[0] >= 12) {
 				$meridian = 'pm';
 			}
-			if ($time[0] == 0 && $timeFormat === '12') {
+			if ($time[0] == 0 && $timeFormat == 12) {
 				$time[0] = 12;
 			}
 			$hour = $min = null;