From a4b71c7d3a69fdab2efbcd94e5ac40ffe5e9ffb0 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Thu, 3 May 2012 02:15:35 +0000
Subject: [PATCH] Fix 12 hour afternoons

---
 resources/inc/class.resources_reserve.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/inc/class.resources_reserve.inc.php b/resources/inc/class.resources_reserve.inc.php
index 7d79251ba6..c342432cfa 100644
--- a/resources/inc/class.resources_reserve.inc.php
+++ b/resources/inc/class.resources_reserve.inc.php
@@ -250,7 +250,7 @@ class resources_reserve {
 		{
 			if($GLOBALS['egw_info']['user']['preferences']['common']['timeformat'] == '12')
 			{
-				$sel_options['hour'][$i] = ($i < '12' ? $i .' am' : ($i-12).' pm');
+				$sel_options['hour'][$i] = ($i < '12' ? $i .' am' : ($i > 12 ? $i -12 : $i).' pm');
 			}
 			else
 			{