From 92471650fe9cd5807f196963eb81147780b8fe5f Mon Sep 17 00:00:00 2001 From: Nathan Gray Date: Wed, 16 May 2012 17:33:37 +0000 Subject: [PATCH] Display error from merge, if merge gives error --- filemanager/inc/class.filemanager_ui.inc.php | 1 + 1 file changed, 1 insertion(+) diff --git a/filemanager/inc/class.filemanager_ui.inc.php b/filemanager/inc/class.filemanager_ui.inc.php index e05f52c24d..6de84dd4ff 100644 --- a/filemanager/inc/class.filemanager_ui.inc.php +++ b/filemanager/inc/class.filemanager_ui.inc.php @@ -740,6 +740,7 @@ function force_download(_action, _senders) if (!$settings) $settings = $GLOBALS['egw_info']['user']['preferences']['filemanager']['default_document']; $document_merge = new filemanager_merge(egw_vfs::decodePath($dir)); $msg = $document_merge->download($settings, $selected, '', $GLOBALS['egw_info']['user']['preferences']['filemanager']['document_dir']); + if($msg) return $msg; $failed = count($selected); return false; }