aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/feed/topic.php
diff options
context:
space:
mode:
authorjaviexin <javiexin@gmail.com>2017-02-15 23:56:52 +0100
committerGitHub <noreply@github.com>2017-02-15 23:56:52 +0100
commit7f69580df3b6125941fc39d63f8498488f32231a (patch)
treef7c3816515cdbe98aee078f8ece97d79f77bd017 /phpBB/phpbb/feed/topic.php
parent7646280d518a4f637ec267fadb5e563f5b149512 (diff)
parentb567c6e2414d069ba54f7a924c952069aa115237 (diff)
downloadforums-7f69580df3b6125941fc39d63f8498488f32231a.tar
forums-7f69580df3b6125941fc39d63f8498488f32231a.tar.gz
forums-7f69580df3b6125941fc39d63f8498488f32231a.tar.bz2
forums-7f69580df3b6125941fc39d63f8498488f32231a.tar.xz
forums-7f69580df3b6125941fc39d63f8498488f32231a.zip
Merge branch '3.1.x' into ticket/15011
Diffstat (limited to 'phpBB/phpbb/feed/topic.php')
-rw-r--r--phpBB/phpbb/feed/topic.php2
1 files changed, 2 insertions, 0 deletions
diff --git a/phpBB/phpbb/feed/topic.php b/phpBB/phpbb/feed/topic.php
index 66c49e55cf..295bf3f795 100644
--- a/phpBB/phpbb/feed/topic.php
+++ b/phpBB/phpbb/feed/topic.php
@@ -91,6 +91,8 @@ class topic extends \phpbb\feed\post_base
function get_sql()
{
+ parent::fetch_attachments();
+
$this->sql = array(
'SELECT' => 'p.post_id, p.post_time, p.post_edit_time, p.post_visibility, p.post_subject, p.post_text, p.bbcode_bitfield, p.bbcode_uid, p.enable_bbcode, p.enable_smilies, p.enable_magic_url, p.post_attachment, ' .
'u.username, u.user_id',