From 5c68bb3bde3d07dde78410b60ae2066b84efd49d Mon Sep 17 00:00:00 2001
From: Normann Lou <normann@silverstripe.com>
Date: Mon, 10 Aug 2009 03:56:59 +0000
Subject: [PATCH] BUGFIX: an time field input between 12:00pm to 12:59pm can't
 save back to database or always save as 00:00:00.

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@84086 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 core/model/fieldtypes/Time.php   |  5 +++--
 tests/fieldtypes/DBFieldTest.php | 22 ++++++++++++++++++++++
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/core/model/fieldtypes/Time.php b/core/model/fieldtypes/Time.php
index 92d4baf01..d86fb6c8c 100755
--- a/core/model/fieldtypes/Time.php
+++ b/core/model/fieldtypes/Time.php
@@ -11,7 +11,7 @@ class Time extends DBField {
 
 	function setValue($value) {	
 		if($value) {
-			if(preg_match( '/(\d{1,2})[:.](\d{2})([ap]m)/', $value, $match )) $this->TwelveHour( $match );
+			if(preg_match( '/(\d{1,2})[:.](\d{2})([a|A|p|P|][m|M])/', $value, $match )) $this->TwelveHour( $match );
 			else $this->value = date('H:i:s', strtotime($value));
 		} else { 
 			$value = null;
@@ -53,7 +53,8 @@ class Time extends DBField {
 		$min = $parts[2];
 		$half = $parts[3];
 		
-		$this->value = (( $half == 'pm' ) ? $hour + 12 : $hour ) .":$min:00";
+		// the transmation should exclude 12:00pm ~ 12:59pm
+		$this->value = (( (strtolower($half) == 'pm') && $hour != '12') ? $hour + 12 : $hour ) .":$min:00";
 	}
 
 	function requireField() {
diff --git a/tests/fieldtypes/DBFieldTest.php b/tests/fieldtypes/DBFieldTest.php
index 5fd14c5f7..b7fd540c1 100644
--- a/tests/fieldtypes/DBFieldTest.php
+++ b/tests/fieldtypes/DBFieldTest.php
@@ -70,6 +70,28 @@ class DBFieldTest extends SapphireTest {
 		$this->assertEquals("'0'", singleton('Text')->prepValueForDB(0000));
 		$this->assertEquals("'test'", singleton('Text')->prepValueForDB('test'));
 		$this->assertEquals("'123'", singleton('Text')->prepValueForDB(123));
+		
+		/* Time behaviour */
+		$time = singleton('Time');
+		$time->setValue('00:01am');
+		$this->assertEquals("00:01:00", $time->getValue());
+		$time->setValue('00:59am');
+		$this->assertEquals("00:59:00", $time->getValue());
+		$time->setValue('11:59am');
+		$this->assertEquals("11:59:00", $time->getValue());
+		$time->setValue('12:00pm');
+		$this->assertEquals("12:00:00", $time->getValue());
+		$time->setValue('12:59am');
+		$this->assertEquals("12:59:00", $time->getValue());
+		$time->setValue('1:00pm');
+		$this->assertEquals("13:00:00", $time->getValue());
+		$time->setValue('11:59pm');
+		$this->assertEquals("23:59:00", $time->getValue());
+		$time->setValue('00:00am');
+		$this->assertEquals("00:00:00", $time->getValue());
+		$time->setValue('00:00:00');
+		$this->assertEquals("00:00:00", $time->getValue());
+
 	}
 	
 }