aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/download
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2012-08-10 03:29:47 +0200
committerAndreas Fischer <bantu@phpbb.com>2012-08-10 03:29:47 +0200
commit6dd0bd0bcec357ed82b9fe3dbaf6816d6f22d9ce (patch)
treef0cca543263b9c0bd05c1f57a6cfc7d7794bfc86 /phpBB/download
parent62305bec6dbb660eaa51f629de2f70341df12666 (diff)
downloadforums-6dd0bd0bcec357ed82b9fe3dbaf6816d6f22d9ce.tar
forums-6dd0bd0bcec357ed82b9fe3dbaf6816d6f22d9ce.tar.gz
forums-6dd0bd0bcec357ed82b9fe3dbaf6816d6f22d9ce.tar.bz2
forums-6dd0bd0bcec357ed82b9fe3dbaf6816d6f22d9ce.tar.xz
forums-6dd0bd0bcec357ed82b9fe3dbaf6816d6f22d9ce.zip
[feature/attach-dl] Do not check for passworted forum when it's a PM.
PHPBB3-11042
Diffstat (limited to 'phpBB/download')
-rw-r--r--phpBB/download/file.php6
1 files changed, 4 insertions, 2 deletions
diff --git a/phpBB/download/file.php b/phpBB/download/file.php
index 282708f846..c4d6c26152 100644
--- a/phpBB/download/file.php
+++ b/phpBB/download/file.php
@@ -327,8 +327,10 @@ else if ($download_id)
else
{
// sizeof($attachments) >= 1
-
- phpbb_download_handle_passworded_forum($db, $auth, $attachment['topic_id']);
+ if (!$attachment['in_message'])
+ {
+ phpbb_download_handle_passworded_forum($db, $auth, $attachment['topic_id']);
+ }
if (!class_exists('compress'))
{