From 066578711ffc6801bf65d2a5ebbf0ace0b879a9d Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Thu, 20 Mar 2008 12:49:34 +0000 Subject: [PATCH] "fixed recuring events (only one event was displayed)" --- calendar/inc/class.socal.inc.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/calendar/inc/class.socal.inc.php b/calendar/inc/class.socal.inc.php index 7de6d834c9..8b0be5cc6f 100644 --- a/calendar/inc/class.socal.inc.php +++ b/calendar/inc/class.socal.inc.php @@ -371,17 +371,16 @@ class socal foreach($rs as $row) { $ids[] = $id = $row['cal_id']; - if ($row['recur_date']) + if ($row['cal_recur_date']) { - $id .= '-'.$row['recur_date']; - $recur_dates[] = $row['recur_date']; + $id .= '-'.$row['cal_recur_date']; + $recur_dates[] = $row['cal_recur_date']; } $row['alarm'] = array(); $row['recur_exception'] = $row['recur_exception'] ? explode(',',$row['recur_exception']) : array(); $events[$id] = egw_db::strip_array_keys($row,'cal_'); } - if (count($events)) { // now ready all users with the given cal_id AND (cal_recur_date=0 or the fitting recur-date)