From 7c40e8d6c90527347c03c9a9c899743e7a968432 Mon Sep 17 00:00:00 2001
From: phpnut <phpnut@cakephp.org>
Date: Sun, 16 Sep 2007 18:54:09 +0000
Subject: [PATCH] Fixes #3191, Undefined variable: _hour

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5656 3807eeeb-6ff5-0310-8944-8be069107fe0
---
 cake/libs/controller/controller.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/cake/libs/controller/controller.php b/cake/libs/controller/controller.php
index 9eb84d1f3..c01b8d2e6 100644
--- a/cake/libs/controller/controller.php
+++ b/cake/libs/controller/controller.php
@@ -962,10 +962,10 @@ class Controller extends Object {
 					}
 
 					if (isset($time['_hour']) && $time['_hour'] != 12 && 'pm' == $meridian) {
-						$time['_hour'] = $_hour + 12;
+						$time['_hour'] = $time['_hour'] + 12;
 					}
 					if (isset($time['_hour']) && $time['_hour'] == 12 && 'am' == $meridian) {
-					     $time['_hour'] = '00';
+						$time['_hour'] = '00';
 					}
 
 					$time = join(':', array_values($time));
@@ -974,7 +974,7 @@ class Controller extends Object {
 					}
 				}
 
-				if ($useNewDate && (isset($date) || $value['null'])) {
+				if ($useNewDate && (isset($date) || isset($value['null']))) {
 					$this->data[$modelClass][$field] = $date;
 				}
 			}