diff options
| author | fisharebest <fisharebest@gmail.com> | 2012-12-23 23:39:39 +0000 |
|---|---|---|
| committer | fisharebest <fisharebest@gmail.com> | 2012-12-23 23:39:39 +0000 |
| commit | e55654a9e0c73655528b19db913d4128d7f8c5fa (patch) | |
| tree | 6232f142e38d45035638fd77d846e8e4604d846c /mediafirewall.php | |
| parent | 22bff89091c9e8172301344a4135aa7681fd541d (diff) | |
| download | webtrees-e55654a9e0c73655528b19db913d4128d7f8c5fa.tar.gz webtrees-e55654a9e0c73655528b19db913d4128d7f8c5fa.tar.bz2 webtrees-e55654a9e0c73655528b19db913d4128d7f8c5fa.zip | |
Fix: mediafirewall exposes original filename in headers
Diffstat (limited to 'mediafirewall.php')
| -rw-r--r-- | mediafirewall.php | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/mediafirewall.php b/mediafirewall.php index b106fc4e00..15451b7ae7 100644 --- a/mediafirewall.php +++ b/mediafirewall.php @@ -236,7 +236,7 @@ function imagettftextErrorHandler($errno, $errstr, $errfile, $errline) { // start processing here // this needs to be a global variable so imagettftextErrorHandler can set it -$useTTF = (function_exists("imagettftext")) ? true : false; +$useTTF = function_exists('imagettftext'); // Media missing/private? if (!$media || !$media->canDisplayDetails()) { @@ -392,14 +392,9 @@ if (($if_modified_since == $filetimeHeader) && !$debug_forceImageRegen) { } } -// reset the 404 error -header($protocol." 200 OK"); -header("Status: 200 OK"); - // send headers for the image if (!$debug_watermark) { header("Content-Type: " . $mimetype); - header('Content-Disposition: '.$disposition.'; filename="'.basename($serverFilename).'"'); } if ($generatewatermark) { |