From 195553ad26b4c8c3639041698309b47ae6d1b1f3 Mon Sep 17 00:00:00 2001 From: Jim Hu Date: Sat, 27 Dec 2008 11:42:41 +0000 Subject: do not check overlap on all day events -- yet --- functions/parse/end_vevent.php | 4 ++-- functions/template.php | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'functions') diff --git a/functions/parse/end_vevent.php b/functions/parse/end_vevent.php index 502d54c..9a13bbe 100644 --- a/functions/parse/end_vevent.php +++ b/functions/parse/end_vevent.php @@ -320,7 +320,7 @@ foreach($recur_data as $recur_data_unixtime) { # the day is not the last day of the recurrence if ($this_date_tmp < $end_date_tmp) $display_end_tmp = '2400'; } - if($this_date_tmp == $end_date_tmp && $end_time == '0000') continue; + 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 'event_end' => $end_time, # hhmm @@ -342,7 +342,7 @@ foreach($recur_data as $recur_data_unixtime) { 'url' => $url, 'recur' => $recur ); - checkOverlap($this_date_tmp, $time_key, $uid); + if($time_key > -1) checkOverlap($this_date_tmp, $time_key, $uid); } } # end foreach recur_data unset($recur_data); diff --git a/functions/template.php b/functions/template.php index 969e7e7..95b0586 100644 --- a/functions/template.php +++ b/functions/template.php @@ -914,6 +914,7 @@ class Page { if ($type != 'small') { foreach ($master_array[$daylink] as $cal_time => $event_times) { foreach ($event_times as $uid => $val) { + if (!isset($val['calnumber'])) continue; $event_calno = $val['calnumber']; $event_calno = (($event_calno - 1) % $unique_colors) + 1; if ($cal_time == -1) { -- cgit v1.2.3