extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-24 17:04:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixing/improving condition of last commit

Browse Source
This commit is contained in:
Ralf Becker 2021-11-15 08:26:06 +01:00
parent 73793d8aa1
commit 54e5a6bd76
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -761,7 +761,7 @@ class calendar_merge extends Api\Storage\Merge
if((strpos($content, '$$range') !== false || strpos($content, '{{range') !== false) && is_array($ids)) if((strpos($content, '$$range') !== false || strpos($content, '{{range') !== false) && is_array($ids))
{ {
// Merging into a template that uses range - need ranges, got events // Merging into a template that uses range - need ranges, got events
if(is_array($ids) && (is_array($ids[0]) && $ids[0]['id'] || is_string($ids[0]))) if (is_array($ids) && (is_array($ids[0]) && isset($ids[0]['id']) || is_string($ids[0])))
{ {
// Passed an array of events, to be handled like a date range // Passed an array of events, to be handled like a date range
$events = $ids; $events = $ids;
@ -777,7 +777,7 @@ class calendar_merge extends Api\Storage\Merge
else if((strpos($content, '$$pagerepeat') !== false || strpos($content, '{{pagerepeat') !== false) else if((strpos($content, '$$pagerepeat') !== false || strpos($content, '{{pagerepeat') !== false)
&& ((strpos($content, '$$range') === false && strpos($content, '{{range') === false))) && ((strpos($content, '$$range') === false && strpos($content, '{{range') === false)))
{ {
if (is_array($ids) && !empty($ids[0]) && !(is_array($ids[0]) || isset($ids[0]['id']))) if (is_array($ids) && !(is_array($ids[0]) && isset($ids[0]['id']) || is_string($ids[0])))
{ {
foreach($ids as $range) foreach($ids as $range)
{ {