Merge branch 'MDL-35358' of git://github.com/rwijaya/moodle

2012-11-14 11:16:47 +08:00
parent 3484a69861 8d880a2ec6
commit 124b3fcef7
1 changed files with 2 additions and 2 deletions
@@ -269,12 +269,12 @@ switch ($mode) {
                list($sort, $sortparams) = users_order_by_sql('u');
                $params = array_merge($params, $sortparams);
                if (!empty($cm->groupingid)) {
-                    $params["groupinid"] = $cm->groupingid;
+                    $params["groupingid"] = $cm->groupingid;
                    $sql = "SELECT DISTINCT $ufields
                            FROM {lesson_attempts} a
                                INNER JOIN {user} u ON u.id = a.userid
                                INNER JOIN {groups_members} gm ON gm.userid = u.id
-                                INNER JOIN {groupings_groups} gg ON gm.groupid = :groupinid
+                                INNER JOIN {groupings_groups} gg ON gm.groupid = gg.groupid AND gg.groupingid = :groupingid
                            WHERE a.lessonid = :lessonid
                            ORDER BY $sort";
                } else {