aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOleg Pudeyev <oleg@bsdpower.com>2012-02-11 05:56:16 -0500
committerOleg Pudeyev <oleg@bsdpower.com>2012-02-11 05:56:16 -0500
commit4b2690f792d330622fd5409ded5f163db1b97bd9 (patch)
tree0224c127d06a188f91f01605b4819b2c2893302d
parente047b286d8ceea3d1621c227cfc13fbe0aa3d834 (diff)
parentf894da0d25f2ecc4c8f3c039dd9f40607137d4ca (diff)
downloadforums-4b2690f792d330622fd5409ded5f163db1b97bd9.tar
forums-4b2690f792d330622fd5409ded5f163db1b97bd9.tar.gz
forums-4b2690f792d330622fd5409ded5f163db1b97bd9.tar.bz2
forums-4b2690f792d330622fd5409ded5f163db1b97bd9.tar.xz
forums-4b2690f792d330622fd5409ded5f163db1b97bd9.zip
Merge remote-tracking branch 'bantu/ticket/10633' into develop-olympus
* bantu/ticket/10633: [ticket/10633] Stop leaking filename of attachments when thumbnail is requested
-rw-r--r--phpBB/download/file.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/download/file.php b/phpBB/download/file.php
index c17f0cf018..bf277c69fa 100644
--- a/phpBB/download/file.php
+++ b/phpBB/download/file.php
@@ -424,7 +424,7 @@ function send_file_to_browser($attachment, $upload_dir, $category)
if (!@file_exists($filename))
{
send_status_line(404, 'Not Found');
- trigger_error($user->lang['ERROR_NO_ATTACHMENT'] . '<br /><br />' . sprintf($user->lang['FILE_NOT_FOUND_404'], $filename));
+ trigger_error('ERROR_NO_ATTACHMENT');
}
// Correct the mime type - we force application/octetstream for all files, except images