diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-12-25 17:54:11 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2017-01-03 22:56:42 +0100 |
| commit | 7cad25e4cbed2efbf891001cd2664f825674d5a7 (patch) | |
| tree | 899eaf8cd5592e6dd9428363c17724da3c1c1a2c /phpBB/phpbb/feed/forum.php | |
| parent | bc96a9f1f67df4719f66896590288eb03f6ca12d (diff) | |
| download | forums-7cad25e4cbed2efbf891001cd2664f825674d5a7.tar forums-7cad25e4cbed2efbf891001cd2664f825674d5a7.tar.gz forums-7cad25e4cbed2efbf891001cd2664f825674d5a7.tar.bz2 forums-7cad25e4cbed2efbf891001cd2664f825674d5a7.tar.xz forums-7cad25e4cbed2efbf891001cd2664f825674d5a7.zip | |
[ticket/14838] Do not query full attachments table in feeds
The fetch_attachments() will also now throw a runtime exception if a feed
tries to do this nonetheless.
PHPBB3-14838
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 7a2087c1cd..6aba12a147 100644 --- a/phpBB/phpbb/feed/forum.php +++ b/phpBB/phpbb/feed/forum.php @@ -112,6 +112,8 @@ class forum extends \phpbb\feed\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', |