mirror of
https://github.com/EGroupware/egroupware.git
synced 2025-02-09 15:00:07 +01:00
* ImportExport: fixed not working export in IE8 (seems to choke on Content-Disposition: attachment header)
This commit is contained in:
parent
195a3353d7
commit
ef0cc4f6bd
@ -179,7 +179,7 @@ class importexport_export_ui {
|
|||||||
if($definition && $definition->plugin_options['selection'] && !$content['selection_passed']) {
|
if($definition && $definition->plugin_options['selection'] && !$content['selection_passed']) {
|
||||||
$_selection = $definition->plugin_options['selection'];
|
$_selection = $definition->plugin_options['selection'];
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($_selection && ($content['old_definition'] == $content['definition'] || $content['selection_passed'])) {
|
if ($_selection && ($content['old_definition'] == $content['definition'] || $content['selection_passed'])) {
|
||||||
$readonlys[$tabs]['selection_tab'] = true;
|
$readonlys[$tabs]['selection_tab'] = true;
|
||||||
$content['selection'] = $_selection;
|
$content['selection'] = $_selection;
|
||||||
@ -494,8 +494,9 @@ class importexport_export_ui {
|
|||||||
// Get charset
|
// Get charset
|
||||||
$charset = egw_cache::getSession('importexport', $tmpfname);
|
$charset = egw_cache::getSession('importexport', $tmpfname);
|
||||||
|
|
||||||
header('Content-type: ' . ($_GET['_type'] ? $_GET['_type'] : 'application/text') . ($charset ? '; charset='.$charset : ''));
|
html::content_header($nicefname.'.'.$_GET['_suffic'],
|
||||||
header('Content-Disposition: attachment; filename="'.$nicefname.'.'.$_GET['_suffix'].'"');
|
($_GET['_type'] ? $_GET['_type'] : 'application/text') . ($charset ? '; charset='.$charset : ''),
|
||||||
|
filesize($tmpfname));
|
||||||
fpassthru($file);
|
fpassthru($file);
|
||||||
|
|
||||||
unlink($tmpfname);
|
unlink($tmpfname);
|
||||||
|
Loading…
Reference in New Issue
Block a user