mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-20 23:41:29 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.1.x' into 3.2.x

Browse Source
This commit is contained in:
Marc Alexander
2017-01-04 17:44:11 +01:00
parent 0da910df94 3d93fd40ed
commit 03be94c1f7
10 changed files with 161 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/phpbb/feed/topic.php
View File

@@ -126,6 +126,8 @@ class topic extends post_base
*/
protected 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',