From 6a05cad69fe1bdce91f9ee4d271cca05ffdb605c Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Thu, 22 Sep 2011 20:53:56 -0400
Subject: [PATCH] Fix Validation::time so it accepts spaces. Fixes #2015

---
 cake/libs/validation.php                  | 2 +-
 cake/tests/cases/libs/validation.test.php | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/cake/libs/validation.php b/cake/libs/validation.php
index b8abb5c9436..552e52d5c20 100644
--- a/cake/libs/validation.php
+++ b/cake/libs/validation.php
@@ -429,7 +429,7 @@ function time($check) {
 		$_this =& Validation::getInstance();
 		$_this->__reset();
 		$_this->check = $check;
-		$_this->regex = '%^((0?[1-9]|1[012])(:[0-5]\d){0,2}([AP]M|[ap]m))$|^([01]\d|2[0-3])(:[0-5]\d){0,2}$%';
+		$_this->regex = '%^((0?[1-9]|1[012])(:[0-5]\d){0,2} ?([AP]M|[ap]m))$|^([01]\d|2[0-3])(:[0-5]\d){0,2}$%';
 		return $_this->_check();
 	}
 
diff --git a/cake/tests/cases/libs/validation.test.php b/cake/tests/cases/libs/validation.test.php
index 0afaf2113d7..418bbe53d8d 100644
--- a/cake/tests/cases/libs/validation.test.php
+++ b/cake/tests/cases/libs/validation.test.php
@@ -1509,6 +1509,8 @@ function testTime() {
 		$this->assertTrue(Validation::time('12:01am'));
 		$this->assertTrue(Validation::time('12:01pm'));
 		$this->assertTrue(Validation::time('1pm'));
+		$this->assertTrue(Validation::time('1 pm'));
+		$this->assertTrue(Validation::time('1 PM'));
 		$this->assertTrue(Validation::time('01:00'));
 		$this->assertFalse(Validation::time('1:00'));
 		$this->assertTrue(Validation::time('1:00pm'));