From 146f04424300980006474a6df649e5943d81ac51 Mon Sep 17 00:00:00 2001
From: skeeter <skeeter@alumni.egroupware.org>
Date: Fri, 29 Jun 2001 17:20:11 +0000
Subject: [PATCH] Fix for bug #432495.

---
 calendar/inc/class.calendar.inc.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/calendar/inc/class.calendar.inc.php b/calendar/inc/class.calendar.inc.php
index ba2f7182b8..b09c7048a9 100755
--- a/calendar/inc/class.calendar.inc.php
+++ b/calendar/inc/class.calendar.inc.php
@@ -228,7 +228,7 @@ class calendar extends calendar_
 		$nextday = mktime(0,0,0,$month,$day + 1,$year) - $this->datetime->tz_offset;
 		if (intval($phpgw->common->show_date($starttime,'Hi')) && $starttime == $endtime)
 		{
-			$time = $phpgw->common->show_date($starttime,'H:i');
+			$time = $phpgw->common->show_date($starttime,$this->users_timeformat);
 		}
 		elseif ($starttime <= $rawdate_offset && $endtime >= $nextday - 60)
 		{
@@ -911,7 +911,7 @@ class calendar extends calendar_
 		$retval = Array();
 		$ok = False;
 
-		if($starttime == $endtime)
+		if($starttime == $endtime && $phpgw->common->show_date($starttime,'Hi') == 0)
 		{
 			$endtime = mktime(23,59,59,$phpgw->common->show_date($starttime,'m'),$phpgw->common->show_date($starttime,'d') + 1,$phpgw->common->show_date($starttime,'Y')) - $this->datetime->tz_offset;
 		}