diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2012-02-11 05:57:39 -0500 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2012-02-11 05:58:29 -0500 |
| commit | 52c9ecd4866860f3187455ec531baaebb651744b (patch) | |
| tree | 1800b3e92f94d9f34859deb8751120fbef1f3abe /phpBB/includes/functions_download.php | |
| parent | 289ac72485c7684272c6958565d870fcf2f41586 (diff) | |
| parent | 4b2690f792d330622fd5409ded5f163db1b97bd9 (diff) | |
| download | forums-52c9ecd4866860f3187455ec531baaebb651744b.tar forums-52c9ecd4866860f3187455ec531baaebb651744b.tar.gz forums-52c9ecd4866860f3187455ec531baaebb651744b.tar.bz2 forums-52c9ecd4866860f3187455ec531baaebb651744b.tar.xz forums-52c9ecd4866860f3187455ec531baaebb651744b.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10633] Stop leaking filename of attachments when thumbnail is requested
Conflicts:
phpBB/download/file.php
Diffstat (limited to 'phpBB/includes/functions_download.php')
| -rw-r--r-- | phpBB/includes/functions_download.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/functions_download.php b/phpBB/includes/functions_download.php index de25e390fa..1486113013 100644 --- a/phpBB/includes/functions_download.php +++ b/phpBB/includes/functions_download.php @@ -126,7 +126,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 |