moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-06 17:36:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-62543-master' of git://github.com/tobiasreischmann/moodle

Browse source
This commit is contained in:
Andrew Nicols 2018-05-28 08:53:41 +08:00
commit daad84d150
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
mod/forum/rsslib.php
View file

@ -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";