From 2511a97fd6f420fac66cf9cb2e96b6e4913956d6 Mon Sep 17 00:00:00 2001 From: Marina Glancy Date: Wed, 24 Jul 2013 21:39:26 +1000 Subject: [PATCH 1/1] MDL-29731 Bugs in recent activity when using separate groups --- mod/forum/lib.php | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/mod/forum/lib.php b/mod/forum/lib.php index f75d41a90c8..bcf3d0a8d53 100644 --- a/mod/forum/lib.php +++ b/mod/forum/lib.php @@ -1525,7 +1525,7 @@ function forum_print_recent_activity($course, $viewfullnames, $timestart) { $modinfo->groups = groups_get_user_groups($course->id); // load all my groups and cache it in modinfo } - if (!array_key_exists($post->groupid, $modinfo->groups[0])) { + if (!in_array($post->groupid, $modinfo->get_groups($cm->groupingid))) { continue; } } @@ -6049,12 +6049,10 @@ function forum_get_recent_mod_activity(&$activities, &$index, $timestart, $cours } if ($groupid) { - $groupselect = "AND gm.groupid = ?"; - $groupjoin = "JOIN {groups_members} gm ON gm.userid=u.id"; + $groupselect = "AND d.groupid = ?"; $params[] = $groupid; } else { $groupselect = ""; - $groupjoin = ""; } $allnames = get_all_user_name_fields(true, 'u'); @@ -6065,7 +6063,6 @@ function forum_get_recent_mod_activity(&$activities, &$index, $timestart, $cours JOIN {forum_discussions} d ON d.id = p.discussion JOIN {forum} f ON f.id = d.forum JOIN {user} u ON u.id = p.userid - $groupjoin WHERE p.created > ? AND f.id = ? $userselect $groupselect ORDER BY p.id ASC", $params)) { // order by initial posting date @@ -6101,7 +6098,7 @@ function forum_get_recent_mod_activity(&$activities, &$index, $timestart, $cours continue; } - if (!array_key_exists($post->groupid, $modinfo->groups[0])) { + if (!in_array($post->groupid, $modinfo->get_groups($cm->groupingid))) { continue; } } -- 2.43.0