diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2017-01-04 17:44:11 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2017-01-04 17:44:11 +0100 |
| commit | 03be94c1f7ca62adf59700584c944966560a31bd (patch) | |
| tree | 1b2701186552f6ed8445a1c6e1937943c7e24a44 /phpBB/phpbb/feed/forum.php | |
| parent | 0da910df949a1e9404a19ec22a7f7a2af48e69f7 (diff) | |
| parent | 3d93fd40edb627dafeede3b5ae3780885e2264fe (diff) | |
| download | forums-03be94c1f7ca62adf59700584c944966560a31bd.tar forums-03be94c1f7ca62adf59700584c944966560a31bd.tar.gz forums-03be94c1f7ca62adf59700584c944966560a31bd.tar.bz2 forums-03be94c1f7ca62adf59700584c944966560a31bd.tar.xz forums-03be94c1f7ca62adf59700584c944966560a31bd.zip | |
Merge branch '3.1.x' into 3.2.x
Diffstat (limited to 'phpBB/phpbb/feed/forum.php')
| -rw-r--r-- | phpBB/phpbb/feed/forum.php | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/phpBB/phpbb/feed/forum.php b/phpBB/phpbb/feed/forum.php index f522e91169..0c142e8cc8 100644 --- a/phpBB/phpbb/feed/forum.php +++ b/phpBB/phpbb/feed/forum.php @@ -138,6 +138,8 @@ class forum extends post_base return false; } + parent::fetch_attachments(array(), $topic_ids); + $this->sql = array( 'SELECT' => 'p.post_id, p.topic_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', |