forked from extern/egroupware
missing paramters to fetch_event()
This commit is contained in:
parent
2a7a4229e1
commit
407b7f0a8c
@ -197,10 +197,11 @@
|
|||||||
|
|
||||||
$p->set_var('color',$phpgw_info['theme']['bg_text']);
|
$p->set_var('color',$phpgw_info['theme']['bg_text']);
|
||||||
|
|
||||||
|
$cal_stream = $phpgw->calendar->open('INBOX',intval($owner),'');
|
||||||
$overlap = '';
|
$overlap = '';
|
||||||
for($i=0;$i<count($overlapping_events);$i++)
|
for($i=0;$i<count($overlapping_events);$i++)
|
||||||
{
|
{
|
||||||
$over = $phpgw->calendar->fetch_event($overlapping_events[$i]);
|
$over = $phpgw->calendar->fetch_event($cal_stream,$overlapping_events[$i]);
|
||||||
$overlap .= '<li>';
|
$overlap .= '<li>';
|
||||||
$private = $phpgw->calendar->is_private($over,$over->owner);
|
$private = $phpgw->calendar->is_private($over,$over->owner);
|
||||||
|
|
||||||
|
@ -716,7 +716,7 @@ class calendar_ extends calendar__
|
|||||||
|
|
||||||
function fetch_current_stream_event($stream)
|
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)
|
function event_add_attribute($stream,$attribute,$value)
|
||||||
@ -736,7 +736,7 @@ class calendar_ extends calendar__
|
|||||||
{
|
{
|
||||||
$event_id = $this->deleted_events[$i];
|
$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->send_update(MSG_DELETED,$event->participants,$event);
|
||||||
|
|
||||||
$this->stream->query('DELETE FROM calendar_entry_user WHERE cal_id='.$event_id,__LINE__,__FILE__);
|
$this->stream->query('DELETE FROM calendar_entry_user WHERE cal_id='.$event_id,__LINE__,__FILE__);
|
||||||
|
Loading…
Reference in New Issue
Block a user