diff options
| author | Chad Little <clittle@users.sourceforge.net> | 2003-02-15 20:07:08 +0000 |
|---|---|---|
| committer | Chad Little <clittle@users.sourceforge.net> | 2003-02-15 20:07:08 +0000 |
| commit | db5981c2ad6a44f90c36efb6ac0296ab2c675935 (patch) | |
| tree | 1f0862ff5195b85a71258bedf5ce10df3ee4f460 | |
| parent | 498d423eee0cb2ae7664a46bfa198aee1a17e996 (diff) | |
| download | phpicalendar-db5981c2ad6a44f90c36efb6ac0296ab2c675935.tar.gz phpicalendar-db5981c2ad6a44f90c36efb6ac0296ab2c675935.tar.bz2 phpicalendar-db5981c2ad6a44f90c36efb6ac0296ab2c675935.zip | |
Fixed a bug with Irix and isset().
| -rw-r--r-- | functions/overlapping_events.php | 4 | ||||
| -rw-r--r-- | includes/event.php | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/functions/overlapping_events.php b/functions/overlapping_events.php index d82dfae..362ea96 100644 --- a/functions/overlapping_events.php +++ b/functions/overlapping_events.php @@ -68,7 +68,7 @@ function checkOverlap($ol_start_date, $ol_start_time, $ol_end_time, $ol_uid) { if ($newOverlapRange) { foreach ($loopBlock["events"] as $blockEvents) { $eventDrawTimes = drawEventTimes($master_array[($ol_start_date)][($blockEvents["time"])][($blockEvents["key"])]["event_start"], $master_array[($ol_start_date)][($blockEvents["time"])][($blockEvents["key"])]["event_end"]); - if (isset($eventDrawTimes["draw_start"], $eventDrawTimes["draw_end"], $drawTimes["draw_end"], $drawTimes["draw_start"]) && ($eventDrawTimes["draw_start"] < $drawTimes["draw_end"]) and ($eventDrawTimes["draw_end"] > $drawTimes["draw_start"])) { + if ((isset($eventDrawTimes["draw_start"]) && isset($eventDrawTimes["draw_end"]) && isset($drawTimes["draw_end"]) && isset($drawTimes["draw_start"])) && ($eventDrawTimes["draw_start"] < $drawTimes["draw_end"]) and ($eventDrawTimes["draw_end"] > $drawTimes["draw_start"])) { // define start time of overlap range and overlap block if ($eventDrawTimes["draw_start"] < $drawTimes["draw_start"]) $overlap_start = $drawTimes["draw_start"]; else $overlap_start = $eventDrawTimes["draw_start"]; @@ -113,7 +113,7 @@ function checkOverlap($ol_start_date, $ol_start_time, $ol_end_time, $ol_uid) { foreach ($master_array[($ol_start_date)] as $keyTime => $eventTime) { foreach ($eventTime as $keyEvent => $event) { if ($keyTime != '-1') $entryDrawTimes = drawEventTimes($event["event_start"], $event["event_end"]); - if (isset($entryDrawTimes["draw_start"], $entryDrawTimes["draw_end"], $drawTimes["draw_end"], $drawTimes["draw_start"]) && ($entryDrawTimes["draw_start"] < $drawTimes["draw_end"]) and ($entryDrawTimes["draw_end"] > $drawTimes["draw_start"])) { + if ((isset($entryDrawTimes["draw_start"]) && isset($entryDrawTimes["draw_end"]) && isset($drawTimes["draw_end"]) && isset($drawTimes["draw_start"])) && ($entryDrawTimes["draw_start"] < $drawTimes["draw_end"]) and ($entryDrawTimes["draw_end"] > $drawTimes["draw_start"])) { // define start time of overlap range and overlap block if ($entryDrawTimes["draw_start"] < $drawTimes["draw_start"]) { $overlap_start = $drawTimes["draw_start"]; diff --git a/includes/event.php b/includes/event.php index 3d95c0a..7a685fa 100644 --- a/includes/event.php +++ b/includes/event.php @@ -65,7 +65,7 @@ $calendar_name2 = str_replace('\\', '', $calendar_name2); <table width="430" border="0" cellspacing="0" cellpadding="0"> <?php if (($start) && ($end)) $event_times = ' - <font class="V9">(<i>'.$start.' - '.$end.'</i>)</font>'; - if ($start == '' && $end == '' && isset($start, $end)) $event_times = ' - <font class="V9">(<i>'.$all_day_lang.'</i>)</font>'; + if ($start == '' && $end == '' && (isset($start) && isset($end))) $event_times = ' - <font class="V9">(<i>'.$all_day_lang.'</i>)</font>'; ?> <tr> <td width="1%"><img src="images/spacer.gif" width="6" height="1" alt=" "></td> |