extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-03 04:29:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

"fixed recuring events (only one event was displayed)"

Browse Source
This commit is contained in:
Ralf Becker 2008-03-20 12:49:34 +00:00
parent 80385db75c
commit 066578711f
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
calendar/inc/class.socal.inc.php
View File

@ -371,17 +371,16 @@ class socal
foreach($rs as $row) foreach($rs as $row)
{ {
$ids[] = $id = $row['cal_id']; $ids[] = $id = $row['cal_id'];
if ($row['recur_date']) if ($row['cal_recur_date'])
{ {
$id .= '-'.$row['recur_date']; $id .= '-'.$row['cal_recur_date'];
$recur_dates[] = $row['recur_date']; $recur_dates[] = $row['cal_recur_date'];
} }
$row['alarm'] = array(); $row['alarm'] = array();
$row['recur_exception'] = $row['recur_exception'] ? explode(',',$row['recur_exception']) : array(); $row['recur_exception'] = $row['recur_exception'] ? explode(',',$row['recur_exception']) : array();
$events[$id] = egw_db::strip_array_keys($row,'cal_'); $events[$id] = egw_db::strip_array_keys($row,'cal_');
} }
if (count($events)) if (count($events))
{ {
// now ready all users with the given cal_id AND (cal_recur_date=0 or the fitting recur-date) // now ready all users with the given cal_id AND (cal_recur_date=0 or the fitting recur-date)