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

Fix unable to merge from listview into document that has {{pagerepeat}}

Browse Source
This commit is contained in:
Nathan Gray 2015-11-24 22:42:46 +00:00
parent c4752fa83a
commit af42a71332
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -118,7 +118,7 @@ class calendar_merge extends bo_merge
function merge_string($content,$ids,$err,$mimetype,$fix) function merge_string($content,$ids,$err,$mimetype,$fix)
{ {
// Handle merging a list of events into a document with range instead of pagerepeat // Handle merging a list of events into a document with range instead of pagerepeat
if(strpos($content, '$$pagerepeat') === false && count($ids) > 1) if(strpos($content, '$$pagerepeat') === false && strpos($content, '{{pagerepeat') === false && count($ids) > 1)
{ {
// Merging more than one something will fail without pagerepeat // Merging more than one something will fail without pagerepeat
if (is_array($ids) && $ids[0]['id']) if (is_array($ids) && $ids[0]['id'])