Update of /cvsroot/phpicalendar/phpicalendar/functions/parse
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv617/functions/parse
Modified Files:
end_vevent.php
Log Message:
do not check overlap on all day events -- yet
Index: end_vevent.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/parse/end_vevent.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** end_vevent.php 27 Dec 2008 10:58:51 -0000 1.18
--- end_vevent.php 27 Dec 2008 11:42:41 -0000 1.19
***************
*** 321,325 ****
if ($this_date_tmp < $end_date_tmp) $display_end_tmp = '2400';
}
! if($this_date_tmp == $end_date_tmp && $end_time == '0000') continue;
$master_array[$this_date_tmp][$time_key][$uid] = array (
'event_start' => $start_time, # hhmm
--- 321,325 ----
if ($this_date_tmp < $end_date_tmp) $display_end_tmp = '2400';
}
! if($this_date_tmp == $end_date_tmp && ($end_time == '0000' ||$time_key == -1)) continue;
$master_array[$this_date_tmp][$time_key][$uid] = array (
'event_start' => $start_time, # hhmm
***************
*** 343,347 ****
'recur' => $recur
);
! checkOverlap($this_date_tmp, $time_key, $uid);
}
} # end foreach recur_data
--- 343,347 ----
'recur' => $recur
);
! if($time_key > -1) checkOverlap($this_date_tmp, $time_key, $uid);
}
} # end foreach recur_data
|
