holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

"- changed $interval parameter to default to 1, if < 1

Browse Source 
- fixed wrong name for recur_enddate"
This commit is contained in:
Ralf Becker 2009-11-12 09:31:42 +00:00
parent fc244efb1f
commit e7a6f37af8
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
calendar/inc/class.calendar_rrule.inc.php
View File

@ -214,9 +214,9 @@ class calendar_rrule implements Iterator
}
}
if (!is_numeric($interval) || $interval < 1)
if ((int)$interval < 1)
{
throw new egw_exception_wrong_parameter(__METHOD__."($time,$type,$interval,$enddate,$data,...) interval $interval is NOT valid!");
$interval = 1; // calendar stores no (extra) interval as null, so using default 1 here
}
$this->interval = (int)$interval;
@ -479,9 +479,9 @@ class calendar_rrule implements Iterator
$time = is_a($event['start'],'DateTime') ? $event['start'] : new egw_time($event['start'],$timestamp_tz);
$time->setTimezone(new DateTimeZone($event['tzid']));
if ($event['enddate'])
if ($event['recur_enddate'])
{
$enddate = is_a($event['enddate'],'DateTime') ? $event['enddate'] : new egw_time($event['enddate'],$timestamp_tz);
$enddate = is_a($event['recur_enddate'],'DateTime') ? $event['recur_enddate'] : new egw_time($event['recur_enddate'],$timestamp_tz);
}
foreach($event['recur_exception'] as $exception)
{