diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-02-24 10:54:51 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-02-24 10:54:51 +0100 |
| commit | cf5253c7b8407b7ff1c998aae9408c112b90cf05 (patch) | |
| tree | d3d0f95a05dea98bf702d140212678831d24b900 /phpBB/includes | |
| parent | ba41e45f84027ebcf8d5118f909cee2bf0b4ddd5 (diff) | |
| parent | 5e2bbdb22b82102c9bb2a1f040ad2755e545941e (diff) | |
| download | forums-cf5253c7b8407b7ff1c998aae9408c112b90cf05.tar forums-cf5253c7b8407b7ff1c998aae9408c112b90cf05.tar.gz forums-cf5253c7b8407b7ff1c998aae9408c112b90cf05.tar.bz2 forums-cf5253c7b8407b7ff1c998aae9408c112b90cf05.tar.xz forums-cf5253c7b8407b7ff1c998aae9408c112b90cf05.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10056] Corrected a typo in Firebird name.
[ticket/10041] Use send_status_line more in download/file.php
Conflicts:
phpBB/download/file.php
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/functions_download.php | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/phpBB/includes/functions_download.php b/phpBB/includes/functions_download.php index 63693c1db4..94bcb36698 100644 --- a/phpBB/includes/functions_download.php +++ b/phpBB/includes/functions_download.php @@ -125,6 +125,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)); } @@ -151,9 +152,11 @@ function send_file_to_browser($attachment, $upload_dir, $category) // PHP track_errors setting On? if (!empty($php_errormsg)) { + send_status_line(500, 'Internal Server Error'); trigger_error($user->lang['UNABLE_TO_DELIVER_FILE'] . '<br />' . sprintf($user->lang['TRACKED_PHP_ERROR'], $php_errormsg)); } + send_status_line(500, 'Internal Server Error'); trigger_error('UNABLE_TO_DELIVER_FILE'); } |