diff options
| author | Piotr Przybylski <piotrprz@gmail.com> | 2011-08-04 22:19:43 +0400 |
|---|---|---|
| committer | Piotr Przybylski <piotrprz@gmail.com> | 2011-08-04 22:19:43 +0400 |
| commit | 66665f326ae28740ea10939feebe223b702943b8 (patch) | |
| tree | 5afaa242e8d25148b9ab5c3648a0754b6de46d53 /transformation_wrapper.php | |
| parent | 3fa5e89bb29bb481576a2cf81d3364402bef8dcf (diff) | |
| parent | 4c62a5fed6efe79b9ab9c667458d365058a914dc (diff) | |
Merge remote-tracking branch 'origin/master' into drizzle
Conflicts:
db_qbe.php
js/server_status.js
libraries/export/xml.php
libraries/schema/Pdf_Relation_Schema.class.php
tbl_printview.php
tbl_structure.php
Diffstat (limited to 'transformation_wrapper.php')
| -rw-r--r-- | transformation_wrapper.php | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/transformation_wrapper.php b/transformation_wrapper.php index 9e329cf80d..1c5e16a3ec 100644 --- a/transformation_wrapper.php +++ b/transformation_wrapper.php @@ -60,16 +60,17 @@ if ($cfgRelation['commwork'] && $cfgRelation['mimework']) { require_once './libraries/header_http.inc.php'; // [MIME] if (isset($ct) && !empty($ct)) { - $content_type = 'Content-Type: ' . $ct; + $mime_type = $ct; } else { - $content_type = 'Content-Type: ' . (isset($mime_map[$transform_key]['mimetype']) ? str_replace('_', '/', $mime_map[$transform_key]['mimetype']) : $default_ct) . (isset($mime_options['charset']) ? $mime_options['charset'] : ''); + $mime_type = (isset($mime_map[$transform_key]['mimetype']) ? str_replace('_', '/', $mime_map[$transform_key]['mimetype']) : $default_ct) . (isset($mime_options['charset']) ? $mime_options['charset'] : ''); } -header($content_type); -if (isset($cn) && !empty($cn)) { - header('Content-Disposition: attachment; filename=' . $cn); +if (empty($cn)) { + $cn = 'download.bin'; } +PMA_download_header($mime_type, $cn); + if (! isset($resize)) { echo $row[$transform_key]; } else { |