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] Combine download_id and post_id queries.

Browse source 
PHPBB3-11042
This commit is contained in:
Andreas Fischer 2012-08-07 01:12:19 +02:00
parent 56cd7e5475
commit 940b9e0658
1 changed files with 3 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
phpBB/download/file.php
View file

@ -153,21 +153,11 @@ if (!$config['allow_attachments'] && !$config['allow_pm_attach'])
// 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 || $post_id)
{ {
$sql = 'SELECT a.attach_id, a.in_message, a.post_msg_id, a.extension, a.is_orphan, a.poster_id, a.filetime $sql = 'SELECT a.attach_id, a.in_message, a.post_msg_id, a.extension, a.is_orphan, a.poster_id, a.filetime
FROM ' . ATTACHMENTS_TABLE . " a FROM ' . ATTACHMENTS_TABLE . ' a
WHERE a.attach_id = $download_id"; WHERE ' . ($download_id ? "a.attach_id = $download_id" : "a.post_msg_id = $post_id");
$result = $db->sql_query($sql);
$attachments = $db->sql_fetchrowset($result);
$db->sql_freeresult($result);
}
else if ($post_id)
{
$sql = 'SELECT a.attach_id, a.in_message, a.post_msg_id, a.extension, a.is_orphan, a.poster_id, a.filetime
FROM ' . ATTACHMENTS_TABLE . " a
WHERE a.post_msg_id = $post_id";
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
$attachments = $db->sql_fetchrowset($result); $attachments = $db->sql_fetchrowset($result);
$db->sql_freeresult($result); $db->sql_freeresult($result);
@ -179,7 +169,6 @@ else if ($topic_id)
WHERE p.topic_id = $topic_id WHERE p.topic_id = $topic_id
AND p.post_attachment = 1 AND p.post_attachment = 1
AND a.post_msg_id = p.post_id"; AND a.post_msg_id = p.post_id";
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
$attachments = $db->sql_fetchrowset($result); $attachments = $db->sql_fetchrowset($result);
$db->sql_freeresult($result); $db->sql_freeresult($result);