L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-62543-33' of git://github.com/tobiasreischmann/moodle into MOODLE_33_STABLE

Browse Source
This commit is contained in:
Andrew Nicols
2018-05-28 08:55:24 +08:00
parent 2ed6a293df 5db5c6dcc3
commit 5aa514982d
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/forum/rsslib.php
+2 -2
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";