Changeset 4935 for trunk/calendar

Timestamp:

08/16/11 16:46:01 (13 years ago)

Author:

roberto.santosjunior

Message:

Ticket #1820 - Evento sem duração em conflito com outro não é apresentado.r4920

File:

• trunk/calendar/inc/class.bocalendar.inc.php (modified) (1 diff)

trunk/calendar/inc/class.bocalendar.inc.php

@@ -1758 +1758 @@
                         elseif ($GLOBALS['phpgw']->datetime->date_compare($event['start']['year'],$event['start']['month'],$event['start']['mday'],$event['end']['year'],$event['end']['month'],$event['end']['mday']) == 0)
                         {
-                                if ($GLOBALS['phpgw']->datetime->time_compare($event['start']['hour'],$event['start']['min'],0,$event['end']['hour'],$event['end']['min'],0) == 1)
+                                if ( ($GLOBALS['phpgw']->datetime->time_compare($event['start']['hour'],$event['start']['min'],0,$event['end']['hour'],$event['end']['min'],0) == 1)
+                                   ||($GLOBALS['phpgw']->datetime->time_compare($event['start']['hour'],$event['start']['min'],0,$event['end']['hour'],$event['end']['min'],0) == 0) )
                                 {
                                         $error = 47;