diff --git a/api/src/Storage/Merge.php b/api/src/Storage/Merge.php index 3d65924954..64c38ce74f 100644 --- a/api/src/Storage/Merge.php +++ b/api/src/Storage/Merge.php @@ -2165,8 +2165,7 @@ abstract class Merge 'icon' => Api\Vfs::mime_icon($file['mime']), 'caption' => Api\Vfs::decodePath($name_arr[$count]), 'group' => 2, - 'postSubmit' => true, // download needs post submit (not Ajax) to work, - 'target' => '_blank', + 'postSubmit' => true, // download needs post submit (not Ajax) to work 'url' => urldecode(http_build_query($edit_attributes)) ); if ($file['mime'] == 'message/rfc822') @@ -2206,13 +2205,6 @@ 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') { @@ -2227,14 +2219,6 @@ 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') {