From 407b7f0a8cfd8b687dcc15d58cba52423ac6f983 Mon Sep 17 00:00:00 2001 From: skeeter Date: Wed, 14 Mar 2001 12:21:52 +0000 Subject: [PATCH] missing paramters to fetch_event() --- calendar/edit_entry_handler.php | 3 ++- calendar/inc/class.calendar_sql.inc.php | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/calendar/edit_entry_handler.php b/calendar/edit_entry_handler.php index 144db45b6b..0d4a1cb605 100755 --- a/calendar/edit_entry_handler.php +++ b/calendar/edit_entry_handler.php @@ -197,10 +197,11 @@ $p->set_var('color',$phpgw_info['theme']['bg_text']); + $cal_stream = $phpgw->calendar->open('INBOX',intval($owner),''); $overlap = ''; for($i=0;$icalendar->fetch_event($overlapping_events[$i]); + $over = $phpgw->calendar->fetch_event($cal_stream,$overlapping_events[$i]); $overlap .= '
  • '; $private = $phpgw->calendar->is_private($over,$over->owner); diff --git a/calendar/inc/class.calendar_sql.inc.php b/calendar/inc/class.calendar_sql.inc.php index 7c8edeb316..7de3f003e2 100755 --- a/calendar/inc/class.calendar_sql.inc.php +++ b/calendar/inc/class.calendar_sql.inc.php @@ -716,7 +716,7 @@ class calendar_ extends calendar__ function fetch_current_stream_event($stream) { - return $this->fetch_event($this->event->id); + return $this->fetch_event($stream,$this->event->id); } function event_add_attribute($stream,$attribute,$value) @@ -736,7 +736,7 @@ class calendar_ extends calendar__ { $event_id = $this->deleted_events[$i]; - $event = $this->fetch_event($event_id); + $event = $this->fetch_event($stream,$event_id); $this->send_update(MSG_DELETED,$event->participants,$event); $this->stream->query('DELETE FROM calendar_entry_user WHERE cal_id='.$event_id,__LINE__,__FILE__);