From f81fd11435727aa0d3d302a6e69880f39d637b05 Mon Sep 17 00:00:00 2001 From: Christian Binder Date: Wed, 4 Jul 2012 17:00:03 +0000 Subject: [PATCH] tag applications which have implemented document merge --- addressbook/inc/class.addressbook_hooks.inc.php | 3 ++- calendar/inc/class.calendar_hooks.inc.php | 1 + filemanager/inc/class.filemanager_hooks.inc.php | 1 + infolog/inc/class.infolog_hooks.inc.php | 1 + timesheet/inc/class.timesheet_hooks.inc.php | 1 + 5 files changed, 6 insertions(+), 1 deletion(-) diff --git a/addressbook/inc/class.addressbook_hooks.inc.php b/addressbook/inc/class.addressbook_hooks.inc.php index f1e67032c2..4050eff571 100644 --- a/addressbook/inc/class.addressbook_hooks.inc.php +++ b/addressbook/inc/class.addressbook_hooks.inc.php @@ -384,7 +384,8 @@ class addressbook_hooks 'addressbook-email' => array( 'query' => 'addressbook.addressbook_bo.link_query_email', ), - ) + ), + 'merge' => true, ); } diff --git a/calendar/inc/class.calendar_hooks.inc.php b/calendar/inc/class.calendar_hooks.inc.php index a257e561a9..e1b1cf3060 100644 --- a/calendar/inc/class.calendar_hooks.inc.php +++ b/calendar/inc/class.calendar_hooks.inc.php @@ -48,6 +48,7 @@ class calendar_hooks 'mime_popup' => '750x400', ), ), + 'merge' => true, ); } diff --git a/filemanager/inc/class.filemanager_hooks.inc.php b/filemanager/inc/class.filemanager_hooks.inc.php index abd9c82daa..418ff6a94e 100644 --- a/filemanager/inc/class.filemanager_hooks.inc.php +++ b/filemanager/inc/class.filemanager_hooks.inc.php @@ -313,6 +313,7 @@ class filemanager_hooks 'mime_target' => '_self', ), ), + 'merge' => true, ); } } diff --git a/infolog/inc/class.infolog_hooks.inc.php b/infolog/inc/class.infolog_hooks.inc.php index dca9d27277..71b0a1ccb3 100644 --- a/infolog/inc/class.infolog_hooks.inc.php +++ b/infolog/inc/class.infolog_hooks.inc.php @@ -69,6 +69,7 @@ class infolog_hooks ), 'edit_id' => 'info_id', 'edit_popup' => '750x580', + 'merge' => true, ); } diff --git a/timesheet/inc/class.timesheet_hooks.inc.php b/timesheet/inc/class.timesheet_hooks.inc.php index 384388962d..e44f0dbaa4 100644 --- a/timesheet/inc/class.timesheet_hooks.inc.php +++ b/timesheet/inc/class.timesheet_hooks.inc.php @@ -58,6 +58,7 @@ class timesheet_hooks 'file_access'=> TIMESHEET_APP.'.timesheet_bo.file_access', 'file_access_user' => true, // file_access supports 4th parameter $user 'notify' => TIMESHEET_APP.'.timesheet_bo.notify', + 'merge' => true, ); }