diff options
| author | Tristan Darricau <github@darricau.eu> | 2014-04-20 18:32:34 +0200 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2014-05-04 15:44:12 +0200 |
| commit | 9dc4e5a61f5bfe7299f9f6ffbd851529ad459ba1 (patch) | |
| tree | 3ace27af4aa4fa765f9bb0376a7e07bb4e1d2657 /phpBB/phpbb/feed/topics_active.php | |
| parent | 68293450f98b97e7f0bf3d62f5835ae08dbbea09 (diff) | |
| download | forums-9dc4e5a61f5bfe7299f9f6ffbd851529ad459ba1.tar forums-9dc4e5a61f5bfe7299f9f6ffbd851529ad459ba1.tar.gz forums-9dc4e5a61f5bfe7299f9f6ffbd851529ad459ba1.tar.bz2 forums-9dc4e5a61f5bfe7299f9f6ffbd851529ad459ba1.tar.xz forums-9dc4e5a61f5bfe7299f9f6ffbd851529ad459ba1.zip | |
[ticket/12459] Fix: Soft deleted topics should appear in feeds
As for the posts, a soft deleted topic should appear (with a corresponding
message) in topic's based feeds.
PHPBB3-12459
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', |