extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 23:00:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Move fix for missing merge into document actions into the right place, was affecting regular merge into document actions too

Browse Source
This commit is contained in:
nathangray 2019-06-11 14:32:12 -06:00
parent c500403e63
commit f11a6eb58d
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
api/src/Contacts/Merge.php
View File

@ -287,11 +287,6 @@ class Merge extends Api\Storage\Merge
protected static function customise_mail_actions(&$action)
{
if ($action['children']['message/rfc822'])
{
// Just email already filtered out
$action['children'] = $action['children']['message/rfc822']['children'];
}
if(strpos($action['egw_open'], 'edit-mail') === 0)
{
unset($action['confirm_multiple']);

5
api/src/Link/Sharing.php
View File

@ -88,6 +88,11 @@ class Sharing extends \EGroupware\Api\Sharing
$documents['order'] = 20;
// Mail only
if ($documents['children']['message/rfc822'])
{
// Just email already filtered out
$documents['children'] = $documents['children']['message/rfc822']['children'];
}
foreach($documents['children'] as $key => &$document)
{
if(strpos($document['target'],'compose_') === FALSE)