From 5db5c6dcc3953b4419b42b39550dd1d6f975281f Mon Sep 17 00:00:00 2001 From: Tobias Reischmann Date: Wed, 23 May 2018 14:05:28 +0200 Subject: [PATCH] MDL-62543 forum: Switched the usage of the deleted flag for rss The deleted flag was introduced through the Privacy API and was used for post selection for the rss feed. In there it was used in the wrong way, which lead to the exclusion of all non deleted posts instead of excluding all deleted ones. This commit fixes this problem. --- mod/forum/rsslib.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mod/forum/rsslib.php b/mod/forum/rsslib.php index f360627dbcf..5b302432103 100644 --- a/mod/forum/rsslib.php +++ b/mod/forum/rsslib.php @@ -189,7 +189,7 @@ function forum_rss_feed_discussions_sql($forum, $cm, $newsince=0) { FROM {forum_discussions} d JOIN {forum_posts} p ON p.discussion = d.id JOIN {user} u ON p.userid = u.id - WHERE d.forum = {$forum->id} AND p.parent = 0 AND p.deleted <> 0 + WHERE d.forum = {$forum->id} AND p.parent = 0 AND p.deleted <> 1 $timelimit $groupselect $newsince ORDER BY $forumsort"; return array($sql, $params); @@ -243,7 +243,7 @@ function forum_rss_feed_posts_sql($forum, $cm, $newsince=0) { {forum_posts} p, {user} u WHERE d.forum = {$forum->id} AND - p.discussion = d.id AND p.deleted <> 0 AND + p.discussion = d.id AND p.deleted <> 1 AND u.id = p.userid $newsince $groupselect ORDER BY p.created desc";