From 9be653e226344b04044f6ea93ac1f9606890f8a0 Mon Sep 17 00:00:00 2001 From: nathangray Date: Wed, 23 Jun 2021 11:31:47 -0600 Subject: [PATCH] Adapt app-specific merges to 186e03671a75d308968b32eefc39c7fbd1e5b04d --- calendar/inc/class.calendar_merge.inc.php | 1 + filemanager/inc/class.filemanager_merge.inc.php | 1 + infolog/inc/class.infolog_merge.inc.php | 1 + timesheet/inc/class.timesheet_merge.inc.php | 1 + 4 files changed, 4 insertions(+) diff --git a/calendar/inc/class.calendar_merge.inc.php b/calendar/inc/class.calendar_merge.inc.php index 2d8ecada0d..c404871a74 100644 --- a/calendar/inc/class.calendar_merge.inc.php +++ b/calendar/inc/class.calendar_merge.inc.php @@ -27,6 +27,7 @@ class calendar_merge extends Api\Storage\Merge var $public_functions = array( 'download_by_request' => true, 'show_replacements' => true, + 'merge_entries' => true ); // Object for getting calendar info diff --git a/filemanager/inc/class.filemanager_merge.inc.php b/filemanager/inc/class.filemanager_merge.inc.php index 7c0e27d306..f19e73a2a6 100644 --- a/filemanager/inc/class.filemanager_merge.inc.php +++ b/filemanager/inc/class.filemanager_merge.inc.php @@ -27,6 +27,7 @@ class filemanager_merge extends Api\Storage\Merge */ var $public_functions = array( 'show_replacements' => true, + 'merge_entries' => true ); /** diff --git a/infolog/inc/class.infolog_merge.inc.php b/infolog/inc/class.infolog_merge.inc.php index b0a81a7e3b..75ff5120ea 100644 --- a/infolog/inc/class.infolog_merge.inc.php +++ b/infolog/inc/class.infolog_merge.inc.php @@ -28,6 +28,7 @@ class infolog_merge extends Api\Storage\Merge var $public_functions = array( 'download_by_request' => true, 'show_replacements' => true, + 'merge_entries' => true, ); /** diff --git a/timesheet/inc/class.timesheet_merge.inc.php b/timesheet/inc/class.timesheet_merge.inc.php index 4a1d52aeb1..2a7070ac95 100644 --- a/timesheet/inc/class.timesheet_merge.inc.php +++ b/timesheet/inc/class.timesheet_merge.inc.php @@ -29,6 +29,7 @@ class timesheet_merge extends Api\Storage\Merge 'download_by_request' => true, 'show_replacements' => true, 'timesheet_replacements' => true, + 'merge_entries' => true ); /**