From 406baf80e481defc39ea0d4efce1c83aacc9824e Mon Sep 17 00:00:00 2001 From: skeeter Date: Sat, 27 Oct 2001 12:59:06 +0000 Subject: [PATCH] This loads up alarms for both the event and any references (events that have been created as a modified event from a repeating event). --- calendar/inc/class.socalendar_sql.inc.php | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/calendar/inc/class.socalendar_sql.inc.php b/calendar/inc/class.socalendar_sql.inc.php index 1ab58025b9..e6c5a036b2 100755 --- a/calendar/inc/class.socalendar_sql.inc.php +++ b/calendar/inc/class.socalendar_sql.inc.php @@ -198,7 +198,16 @@ class socalendar_ extends socalendar__ } } - $this->stream->query('SELECT * FROM phpgw_cal_alarm WHERE cal_id='.$event_id.' AND cal_owner='.$this->user,__LINE__,__FILE__); + if($this->event['reference']) + { + $alarm_cal_id = $event_id.','.$this->event['reference']; + } + else + { + $alarm_cal_id = $event_id; + } + + $this->stream->query('SELECT * FROM phpgw_cal_alarm WHERE cal_id in ('.$alarm_cal_id.') AND cal_owner='.$this->user,__LINE__,__FILE__); if($this->stream->num_rows()) { while($this->stream->next_record())