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

MDL-46826 forum: make sql query indexed, regression from MDL-31089

Browse Source
This commit is contained in:
Marina Glancy
2014-08-15 11:47:03 +08:00
parent e95c5eed2c
commit 756d8f1171
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/forum/lib.php
+6 -5
View File
@@ -1438,12 +1438,12 @@ function forum_print_overview($courses,&$htmlarray) {
// If the user has never entered into the course all posts are pending
if ($course->lastaccess == 0) {
$coursessqls[] = '(d.course = ?)';
$coursessqls[] = '(f.course = ?)';
$params[] = $course->id;
// Only posts created after the course last access
} else {
$coursessqls[] = '(d.course = ? AND p.created > ?)';
$coursessqls[] = '(f.course = ? AND p.created > ?)';
$params[] = $course->id;
$params[] = $course->lastaccess;
}
@@ -1451,12 +1451,13 @@ function forum_print_overview($courses,&$htmlarray) {
$params[] = $USER->id;
$coursessql = implode(' OR ', $coursessqls);
$sql = "SELECT d.id, d.forum, d.course, d.groupid, COUNT(*) as count "
.'FROM {forum_discussions} d '
$sql = "SELECT d.id, d.forum, f.course, d.groupid, COUNT(*) as count "
.'FROM {forum} f '
.'JOIN {forum_discussions} d ON d.forum = f.id '
.'JOIN {forum_posts} p ON p.discussion = d.id '
."WHERE ($coursessql) "
.'AND p.userid != ? '
.'GROUP BY d.id, d.forum, d.course, d.groupid';
.'GROUP BY d.id, d.forum, f.course, d.groupid';
// Avoid warnings.
if (!$discussions = $DB->get_records_sql($sql, $params)) {