extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-14 01:48:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix for bug #432495.

Browse Source
This commit is contained in:
skeeter 2001-06-29 17:20:11 +00:00
parent 17a17cba4e
commit 146f044243
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
calendar/inc/class.calendar.inc.php
View File

@ -228,7 +228,7 @@ class calendar extends calendar_
$nextday = mktime(0,0,0,$month,$day + 1,$year) - $this->datetime->tz_offset; $nextday = mktime(0,0,0,$month,$day + 1,$year) - $this->datetime->tz_offset;
if (intval($phpgw->common->show_date($starttime,'Hi')) && $starttime == $endtime) 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) elseif ($starttime <= $rawdate_offset && $endtime >= $nextday - 60)
{ {
@ -911,7 +911,7 @@ class calendar extends calendar_
$retval = Array(); $retval = Array();
$ok = False; $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; $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;
} }