mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-28 22:28:51 +00:00
Merge branch 'develop-olympus' into develop
* develop-olympus: [ticket/10633] Stop leaking filename of attachments when thumbnail is requested Conflicts: phpBB/download/file.php
This commit is contained in:
commit
52c9ecd486
1 changed files with 1 additions and 1 deletions
|
@ -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
|
||||
|
|
Loading…
Add table
Reference in a new issue