extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-12 17:08:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Calendar - Allow templates without pagerepeat or range tags to work using only the first ID

Browse Source
This commit is contained in:
nathangray 2018-02-07 11:02:50 -07:00
parent 582e11c4ba
commit 85c363a79e
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -585,7 +585,8 @@ class calendar_merge extends Api\Storage\Merge
* Validate and properly format a list of 'ID's into either a list of ranges * Validate and properly format a list of 'ID's into either a list of ranges
* or a list of IDs, depending on what the template needs. Templates using * or a list of IDs, depending on what the template needs. Templates using
* the range placeholder need a list of date ranges, templates using pagerepeat * the range placeholder need a list of date ranges, templates using pagerepeat
* need a list of individual events. * need a list of individual events. Templates using neither get just the
* first ID
* *
* @param Array[]|String[] $ids List of IDs, which can be a list of individual * @param Array[]|String[] $ids List of IDs, which can be a list of individual
* event IDs, entire events, a date range (start & end) or a list of date ranges. * event IDs, entire events, a date range (start & end) or a list of date ranges.
@ -638,6 +639,10 @@ class calendar_merge extends Api\Storage\Merge
} }
} }
} }
else
{
$validated_ids[] = $this->normalize_event_id(array_shift($ids));
}
return $validated_ids; return $validated_ids;
} }