diff options
author | Sem <sembrestels@riseup.net> | 2012-05-20 02:39:46 +0200 |
---|---|---|
committer | Sem <sembrestels@riseup.net> | 2012-05-20 02:39:46 +0200 |
commit | 59bec8bc3e61e6ad537c1418e64094d0665470af (patch) | |
tree | 9f9826a3ca09a23c46d63284a93bf3523e60f36c /mod/file | |
parent | 5da1b3002e12ed112c92c0902f518c82bdd3fbe0 (diff) | |
parent | 14d2c70e1872f4045fc857be9b9022d085f1fbd1 (diff) | |
download | elgg-59bec8bc3e61e6ad537c1418e64094d0665470af.tar.gz elgg-59bec8bc3e61e6ad537c1418e64094d0665470af.tar.bz2 |
Merge branch '1.8' of git://github.com/Elgg/Elgg into lorea-preprod
Diffstat (limited to 'mod/file')
-rw-r--r-- | mod/file/pages/file/download.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mod/file/pages/file/download.php b/mod/file/pages/file/download.php index 00e6d500e..76c1f1272 100644 --- a/mod/file/pages/file/download.php +++ b/mod/file/pages/file/download.php @@ -26,7 +26,7 @@ $filename = $file->originalfilename; header("Pragma: public"); header("Content-type: $mime"); -if (strpos($mime, "image/") !== false) { +if (strpos($mime, "image/") !== false || $mime == "application/pdf") { header("Content-Disposition: inline; filename=\"$filename\""); } else { header("Content-Disposition: attachment; filename=\"$filename\""); |