diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-05-06 13:59:09 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-05-06 13:59:09 +0200 |
| commit | c7d29fbdb1bb0d265e7791ce40699def97f4388e (patch) | |
| tree | e8ec269bdf1022b59dbebd101932ebb1db361648 /phpBB/phpbb/feed/topics_active.php | |
| parent | 1b3d54f5dd38bc1bbb5d1f4d87ad53e04e8a9bf6 (diff) | |
| parent | 717f8a6671a216b4d9985c286454b47cd9cb8691 (diff) | |
| download | forums-c7d29fbdb1bb0d265e7791ce40699def97f4388e.tar forums-c7d29fbdb1bb0d265e7791ce40699def97f4388e.tar.gz forums-c7d29fbdb1bb0d265e7791ce40699def97f4388e.tar.bz2 forums-c7d29fbdb1bb0d265e7791ce40699def97f4388e.tar.xz forums-c7d29fbdb1bb0d265e7791ce40699def97f4388e.zip | |
Merge pull request #2373 from Nicofuma/ticket/12459
[ticket/12459] Unapproved posts/topics are not correctly handled in feeds
* Nicofuma/ticket/12459:
[ticket/12459] Change language strings
[ticket/12459] Enable related tests
[ticket/12459] Fix: Differentiating unapproved and deleted posts
[ticket/12459] Fix: Soft deleted topics should appear in feeds
[ticket/12459] Fix: the posts were always marked as unapproved
Diffstat (limited to 'phpBB/phpbb/feed/topics_active.php')
| -rw-r--r-- | phpBB/phpbb/feed/topics_active.php | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/phpBB/phpbb/feed/topics_active.php b/phpBB/phpbb/feed/topics_active.php index 809a536c2a..c7234510fb 100644 --- a/phpBB/phpbb/feed/topics_active.php +++ b/phpBB/phpbb/feed/topics_active.php @@ -51,9 +51,8 @@ class topics_active extends \phpbb\feed\topic_base // We really have to get the post ids first! $sql = 'SELECT topic_last_post_id, topic_last_post_time FROM ' . TOPICS_TABLE . ' - WHERE ' . $this->db->sql_in_set('forum_id', $in_fid_ary) . ' - AND topic_moved_id = 0 - AND topic_visibility = ' . ITEM_APPROVED . ' + WHERE topic_moved_id = 0 + AND ' . $this->content_visibility->get_forums_visibility_sql('topic', $in_fid_ary) . ' ' . $last_post_time_sql . ' ORDER BY topic_last_post_time DESC'; $result = $this->db->sql_query_limit($sql, $this->num_items); @@ -74,7 +73,7 @@ class topics_active extends \phpbb\feed\topic_base 'SELECT' => 'f.forum_id, f.forum_name, t.topic_id, t.topic_title, t.topic_posts_approved, t.topic_posts_unapproved, t.topic_posts_softdeleted, t.topic_views, t.topic_last_poster_id, t.topic_last_poster_name, t.topic_last_post_time, - p.post_id, p.post_time, p.post_edit_time, p.post_text, p.bbcode_bitfield, p.bbcode_uid, p.enable_bbcode, p.enable_smilies, p.enable_magic_url, p.post_attachment', + p.post_id, p.post_time, p.post_edit_time, p.post_text, p.bbcode_bitfield, p.bbcode_uid, p.enable_bbcode, p.enable_smilies, p.enable_magic_url, p.post_attachment, t.topic_visibility', 'FROM' => array( TOPICS_TABLE => 't', POSTS_TABLE => 'p', |