holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Display error from merge, if merge gives error

Browse Source
This commit is contained in:
Nathan Gray 2012-05-16 17:33:37 +00:00
parent a1e8b468b4
commit 92471650fe
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
filemanager/inc/class.filemanager_ui.inc.php
View File

@ -740,6 +740,7 @@ function force_download(_action, _senders)
if (!$settings) $settings = $GLOBALS['egw_info']['user']['preferences']['filemanager']['default_document']; if (!$settings) $settings = $GLOBALS['egw_info']['user']['preferences']['filemanager']['default_document'];
$document_merge = new filemanager_merge(egw_vfs::decodePath($dir)); $document_merge = new filemanager_merge(egw_vfs::decodePath($dir));
$msg = $document_merge->download($settings, $selected, '', $GLOBALS['egw_info']['user']['preferences']['filemanager']['document_dir']); $msg = $document_merge->download($settings, $selected, '', $GLOBALS['egw_info']['user']['preferences']['filemanager']['document_dir']);
if($msg) return $msg;
$failed = count($selected); $failed = count($selected);
return false; return false;
} }