diff options
| author | Dries Buytaert <dries@buytaert.net> | 2005-11-30 11:03:58 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2005-11-30 11:03:58 +0000 |
| commit | 0f6067fc849f749ca4356a5db224c6a0e5f95666 (patch) | |
| tree | d94eae0347570b6c51dcb105c9ee6f8cca67152d /modules/upload | |
| parent | 2917261693c0eea6d4593096024398e6d7141be7 (diff) | |
| download | brdo-0f6067fc849f749ca4356a5db224c6a0e5f95666.tar.gz brdo-0f6067fc849f749ca4356a5db224c6a0e5f95666.tar.bz2 | |
- Removed valid_input_check().
Diffstat (limited to 'modules/upload')
| -rw-r--r-- | modules/upload/upload.module | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/modules/upload/upload.module b/modules/upload/upload.module index 79254ba83..8237031cc 100644 --- a/modules/upload/upload.module +++ b/modules/upload/upload.module @@ -123,7 +123,7 @@ function upload_settings() { function upload_download() { foreach ($_SESSION['file_uploads'] as $file) { if ($file->_filename == $_GET['q']) { - file_transfer($file->filepath, array('Content-Type: '. $file->filemime, 'Content-Length: '. $file->filesize)); + file_transfer($file->filepath, array('Content-Type: '. mime_header_encode($file->filemime), 'Content-Length: '. $file->filesize)); } } } @@ -134,9 +134,10 @@ function upload_file_download($file) { $result = db_query(db_rewrite_sql("SELECT f.nid, f.* FROM {files} f WHERE filepath = '%s'", 'f'), $file); if ($file = db_fetch_object($result)) { $name = mime_header_encode($file->filename); + $type = mime_header_encode($file->filemime); // Serve images and text inline for the browser to display rather than download. $disposition = ereg('^(text/|image/)', $file->filemime) ? 'inline' : 'attachment'; - return array('Content-Type: '. $file->filemime .'; name='. $name, + return array('Content-Type: '. $type .'; name='. $name, 'Content-Length: '. $file->filesize, 'Content-Disposition: '. $disposition .'; filename='. $name); } |