From f2dec7deac5240ffb9334b64fd9461bdfec65927 Mon Sep 17 00:00:00 2001 From: Nathan Gray Date: Thu, 3 Jul 2014 16:51:21 +0000 Subject: [PATCH] Don't exit after creating a ZIP so caller can do cleanup, if needed. --- filemanager/inc/class.filemanager_ui.inc.php | 3 ++- phpgwapi/inc/class.egw_vfs.inc.php | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/filemanager/inc/class.filemanager_ui.inc.php b/filemanager/inc/class.filemanager_ui.inc.php index 9ba1310469..5483968216 100644 --- a/filemanager/inc/class.filemanager_ui.inc.php +++ b/filemanager/inc/class.filemanager_ui.inc.php @@ -614,7 +614,8 @@ class filemanager_ui return lang("Error while creating directory."); case 'saveaszip': - return egw_vfs::download_zip($selected); + egw_vfs::download_zip($selected); + common::egw_exit(); default: list($action, $settings) = explode('_', $action, 2); diff --git a/phpgwapi/inc/class.egw_vfs.inc.php b/phpgwapi/inc/class.egw_vfs.inc.php index b078cd7362..c05ba09add 100644 --- a/phpgwapi/inc/class.egw_vfs.inc.php +++ b/phpgwapi/inc/class.egw_vfs.inc.php @@ -1495,8 +1495,8 @@ class egw_vfs extends vfs_stream_wrapper { unlink($temp_file); } - - common::egw_exit(); + + // Make sure to exit after, if you don't want to add to the ZIP } /**