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

[feature/attach-dl] Removed reliance on current($row)

Browse source 
PHPBB3-11042
This commit is contained in:
Fyorl 2012-08-14 13:02:12 +01:00
parent 003f8b514b
commit 5c9b3208f5
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
phpBB/download/file.php
View file

@ -323,20 +323,20 @@ else
{ {
if ($attachment['in_message']) if ($attachment['in_message'])
{ {
$sql = 'SELECT message_subject $sql = 'SELECT message_subject AS attach_subject
FROM ' . PRIVMSGS_TABLE . " FROM ' . PRIVMSGS_TABLE . "
WHERE msg_id = $post_id"; WHERE msg_id = $post_id";
} }
else else
{ {
$sql = 'SELECT post_subject, forum_id $sql = 'SELECT post_subject AS attach_subject, forum_id
FROM ' . POSTS_TABLE . " FROM ' . POSTS_TABLE . "
WHERE post_id = $post_id"; WHERE post_id = $post_id";
} }
} }
else else
{ {
$sql = 'SELECT topic_title, forum_id $sql = 'SELECT topic_title AS attach_subject, forum_id
FROM ' . TOPICS_TABLE . " FROM ' . TOPICS_TABLE . "
WHERE topic_id = $topic_id"; WHERE topic_id = $topic_id";
} }
@ -351,7 +351,7 @@ else
trigger_error('ERROR_NO_ATTACHMENT'); trigger_error('ERROR_NO_ATTACHMENT');
} }
$clean_name = phpbb_download_clean_filename(current($row)); $clean_name = phpbb_download_clean_filename($row['attach_subject']);
$suffix = '_' . (($post_id) ? $post_id : $topic_id) . '_' . $clean_name; $suffix = '_' . (($post_id) ? $post_id : $topic_id) . '_' . $clean_name;
$store_name = 'att_' . time() . '_' . unique_id(); $store_name = 'att_' . time() . '_' . unique_id();