extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-30 09:48:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Missed part of b021767ac1, not sure why it didn't come

Browse Source
This commit is contained in:
nathan 2021-07-12 16:38:18 -06:00
parent 7f63e612dd
commit e75bef4415
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
api/src/Storage/Merge.php
View File

@ -2206,6 +2206,13 @@ abstract class Merge
'target' => '_blank',
'postSubmit' => true, // download needs post submit (not Ajax) to work
);
$edit_attributes = array(
'menuaction' => $GLOBALS['egw_info']['flags']['currentapp'].'.'.get_called_class().'.merge_entries',
'document' => $file['path'],
'merge' => get_called_class(),
'id' => '$id',
'select_all' => '$select_all'
);
$documents[$file['mime']]['children'][$prefix.$file['name']]['url'] = urldecode(http_build_query($edit_attributes));
if ($file['mime'] == 'message/rfc822')
{
@ -2220,6 +2227,14 @@ abstract class Merge
'group' => 2,
'target' => '_blank'
);
$edit_attributes = array(
'menuaction' => $GLOBALS['egw_info']['flags']['currentapp'].'.'.get_called_class().'.merge_entries',
'document' => $file['path'],
'merge' => get_called_class(),
'id' => '$id',
'select_all' => '$select_all'
);
$documents[$prefix.$file['name']]['url'] = urldecode(http_build_query($edit_attributes));
if ($file['mime'] == 'message/rfc822')
{