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

Merge branch 'MDL-35788-34' of git://github.com/andrewnicols/moodle into MOODLE_34_STABLE

Browse Source
This commit is contained in:
Jun Pataleta
2018-10-04 12:46:07 +08:00
parent 7277817938 1f700517cd
commit 591a54cd72
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/forum/lib.php
+2 -2
View File
@@ -2660,7 +2660,7 @@ function forum_get_discussions($cm, $forumsort="", $fullpost=true, $unused=-1, $
$forumsort = forum_get_default_sort_order();
}
if (empty($fullpost)) {
$postdata = "p.id,p.subject,p.modified,p.discussion,p.userid";
$postdata = "p.id, p.subject, p.modified, p.discussion, p.userid, p.created";
} else {
$postdata = "p.*";
}
@@ -2681,7 +2681,7 @@ function forum_get_discussions($cm, $forumsort="", $fullpost=true, $unused=-1, $
}
$allnames = get_all_user_name_fields(true, 'u');
$sql = "SELECT $postdata, d.name, d.timemodified, d.usermodified, d.groupid, d.timestart, d.timeend, d.pinned, p.created,
$sql = "SELECT $postdata, d.name, d.timemodified, d.usermodified, d.groupid, d.timestart, d.timeend, d.pinned,
$allnames, u.email, u.picture, u.imagealt $umfields
FROM {forum_discussions} d
JOIN {forum_posts} p ON p.discussion = d.id