From 9f6df8be0ad1bbf4195bc79ef78e05104a74f298 Mon Sep 17 00:00:00 2001
From: CaMer0n <cameron@e107coders.org>
Date: Thu, 6 Sep 2012 18:59:09 +0000
Subject: [PATCH] Date handler am/pm fix.

---
 e107_handlers/date_handler.php | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/e107_handlers/date_handler.php b/e107_handlers/date_handler.php
index 44034ab3f..632dbb145 100644
--- a/e107_handlers/date_handler.php
+++ b/e107_handlers/date_handler.php
@@ -514,9 +514,18 @@ class convert
 	
 			}
 			
-			if($ampm && ($vals['tm_AMPM'] == 'AM' || $vals['tm_ampm'] == 'am') )
+			if($ampm)
 			{
-				$vals['tm_hour'] = intval($vals['tm_hour'] - 12);					
+				if($vals['tm_hour'] == 12 && ($vals['tm_AMPM'] == 'AM' || $vals['tm_ampm'] == 'am'))
+				{
+					$vals['tm_hour'] = 0;			
+				}
+				
+				if($vals['tm_hour'] < 12 && ($vals['tm_AMPM'] == 'PM' || $vals['tm_ampm'] == 'pm'))
+				{
+					$vals['tm_hour'] = intval($vals['tm_hour']) + 12;			
+				}
+							
 			}
 			
 			//$vals['tm_sec'] -= 1; always increasing tm_sec + 1 ??????