aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/download.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2004-09-17 09:11:48 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2004-09-17 09:11:48 +0000
commit8906e07d414a2fa379e3aba0b96b4f3ea468699f (patch)
tree861c223dc014c75aecd107501b46c831296df4b1 /phpBB/download.php
parentf8c8d23a726df53c420268fd5c4d7aec468a107b (diff)
downloadforums-8906e07d414a2fa379e3aba0b96b4f3ea468699f.tar
forums-8906e07d414a2fa379e3aba0b96b4f3ea468699f.tar.gz
forums-8906e07d414a2fa379e3aba0b96b4f3ea468699f.tar.bz2
forums-8906e07d414a2fa379e3aba0b96b4f3ea468699f.tar.xz
forums-8906e07d414a2fa379e3aba0b96b4f3ea468699f.zip
- extensions_allowed changed a bit.
git-svn-id: file:///svn/phpbb/trunk@4986 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/download.php')
-rw-r--r--phpBB/download.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/phpBB/download.php b/phpBB/download.php
index eff6d0c603..2cac956a53 100644
--- a/phpBB/download.php
+++ b/phpBB/download.php
@@ -87,7 +87,8 @@ else
}
// disallowed ?
-if (!extension_allowed($row['forum_id'], $attachment['extension']))
+$extensions = array();
+if (!extension_allowed($row['forum_id'], $attachment['extension'], $extensions))
{
trigger_error(sprintf($user->lang['EXTENSION_DISABLED_AFTER_POSTING'], $attachment['extension']));
}
@@ -207,7 +208,7 @@ function send_file_to_browser($attachment, $upload_dir, $category)
header("Content-length: $size");
}
$result = @readfile($filename);
-
+
if (!$result)
{
trigger_error('Unable to deliver file.<br />Error was: ' . $php_errormsg, E_USER_WARNING);