From ef0cc4f6bd7b9f9373f087a600bfd1d3c19a7953 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Mon, 2 Jul 2012 15:43:17 +0000 Subject: [PATCH] * ImportExport: fixed not working export in IE8 (seems to choke on Content-Disposition: attachment header) --- importexport/inc/class.importexport_export_ui.inc.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/importexport/inc/class.importexport_export_ui.inc.php b/importexport/inc/class.importexport_export_ui.inc.php index 9f6a6f1162..8d635929cd 100644 --- a/importexport/inc/class.importexport_export_ui.inc.php +++ b/importexport/inc/class.importexport_export_ui.inc.php @@ -179,7 +179,7 @@ class importexport_export_ui { if($definition && $definition->plugin_options['selection'] && !$content['selection_passed']) { $_selection = $definition->plugin_options['selection']; } - + if ($_selection && ($content['old_definition'] == $content['definition'] || $content['selection_passed'])) { $readonlys[$tabs]['selection_tab'] = true; $content['selection'] = $_selection; @@ -494,8 +494,9 @@ class importexport_export_ui { // Get charset $charset = egw_cache::getSession('importexport', $tmpfname); - header('Content-type: ' . ($_GET['_type'] ? $_GET['_type'] : 'application/text') . ($charset ? '; charset='.$charset : '')); - header('Content-Disposition: attachment; filename="'.$nicefname.'.'.$_GET['_suffix'].'"'); + html::content_header($nicefname.'.'.$_GET['_suffic'], + ($_GET['_type'] ? $_GET['_type'] : 'application/text') . ($charset ? '; charset='.$charset : ''), + filesize($tmpfname)); fpassthru($file); unlink($tmpfname);