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

Merge branch '3.3.x'

Browse source
This commit is contained in:
Marc Alexander 2021-06-13 11:30:15 +02:00
commit 210c4e2aaa
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
phpBB/phpbb/storage/controller/attachment.php
View file

@ -150,7 +150,7 @@ class attachment extends controller
{ {
$this->phpbb_download_handle_forum_auth($attachment['topic_id']); $this->phpbb_download_handle_forum_auth($attachment['topic_id']);
$sql = 'SELECT forum_id, post_visibility $sql = 'SELECT forum_id, poster_id, post_visibility
FROM ' . POSTS_TABLE . ' FROM ' . POSTS_TABLE . '
WHERE post_id = ' . (int) $attachment['post_msg_id']; WHERE post_id = ' . (int) $attachment['post_msg_id'];
$result = $this->db->sql_query($sql); $result = $this->db->sql_query($sql);
@ -311,15 +311,15 @@ class attachment extends controller
*/ */
protected function phpbb_download_handle_forum_auth(int $topic_id): void protected function phpbb_download_handle_forum_auth(int $topic_id): void
{ {
$sql_array = array( $sql_array = [
'SELECT' => 't.topic_visibility, t.forum_id, f.forum_name, f.forum_password, f.parent_id', 'SELECT' => 't.forum_id, t.topic_poster, t.topic_visibility, f.forum_name, f.forum_password, f.parent_id',
'FROM' => array( 'FROM' => [
TOPICS_TABLE => 't', TOPICS_TABLE => 't',
FORUMS_TABLE => 'f', FORUMS_TABLE => 'f',
), ],
'WHERE' => 't.topic_id = ' . (int) $topic_id . ' 'WHERE' => 't.topic_id = ' . (int) $topic_id . '
AND t.forum_id = f.forum_id', AND t.forum_id = f.forum_id',
); ];
$sql = $this->db->sql_build_query('SELECT', $sql_array); $sql = $this->db->sql_build_query('SELECT', $sql_array);
$result = $this->db->sql_query($sql); $result = $this->db->sql_query($sql);