makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[feature/attach-dl] Store query result always in $attachments first.

Browse source 
PHPBB3-11042
This commit is contained in:
Andreas Fischer 2012-08-07 01:03:32 +02:00
parent 5986676f4d
commit 56cd7e5475
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
phpBB/download/file.php
View file

@ -151,9 +151,6 @@ if (!$config['allow_attachments'] && !$config['allow_pm_attach'])
trigger_error('ATTACHMENT_FUNCTIONALITY_DISABLED'); trigger_error('ATTACHMENT_FUNCTIONALITY_DISABLED');
} }
$attachment = ($download_id) ? array() : false;
$attachments = ($topic_id || $post_id) ? array() : false;
// If multiple arguments are provided, the precedence is as follows: // If multiple arguments are provided, the precedence is as follows:
// $download_id, $post_id, $topic_id // $download_id, $post_id, $topic_id
if ($download_id) if ($download_id)
@ -162,7 +159,7 @@ if ($download_id)
FROM ' . ATTACHMENTS_TABLE . " a FROM ' . ATTACHMENTS_TABLE . " a
WHERE a.attach_id = $download_id"; WHERE a.attach_id = $download_id";
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
$attachment = $db->sql_fetchrow($result); $attachments = $db->sql_fetchrowset($result);
$db->sql_freeresult($result); $db->sql_freeresult($result);
} }
else if ($post_id) else if ($post_id)
@ -193,11 +190,15 @@ else
trigger_error('NO_ATTACHMENT_SELECTED'); trigger_error('NO_ATTACHMENT_SELECTED');
} }
if (!$attachment && !$attachments) if (empty($attachments))
{ {
send_status_line(404, 'Not Found'); send_status_line(404, 'Not Found');
trigger_error('ERROR_NO_ATTACHMENT'); trigger_error('ERROR_NO_ATTACHMENT');
} }
else if ($download_id)
{
$attachment = current($attachments);
}
if ($attachment && ((!$attachment['in_message'] && !$config['allow_attachments']) || ($attachment['in_message'] && !$config['allow_pm_attach']))) if ($attachment && ((!$attachment['in_message'] && !$config['allow_attachments']) || ($attachment['in_message'] && !$config['allow_pm_attach'])))
{ {