Merge branch 'MDL-35648' of git://github.com/danielneis/moodle

DavidSichau · Jun 16, 2014 · 4a61670 · 4a61670
2 parents 6581e38 + e4401d0
commit 4a61670
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/report/participation/index.php b/report/participation/index.php
@@ -239,7 +239,7 @@
             $params['tilltime'] = $minloginternalreader;
         }
         $sql = "SELECT ra.userid, $usernamefields, u.idnumber, l.actioncount AS count
-                  FROM (SELECT * FROM {role_assignments} WHERE contextid $relatedctxsql AND roleid = :roleid ) ra
+                  FROM (SELECT DISTINCT userid FROM {role_assignments} WHERE contextid $relatedctxsql AND roleid = :roleid ) ra
                   JOIN {user} u ON u.id = ra.userid
              $groupsql
              LEFT JOIN (
@@ -264,7 +264,7 @@
     // Get record from sql_internal_reader and merge with records got from legacy log (if needed).
     if (!$onlyuselegacyreader) {
         $sql = "SELECT ra.userid, $usernamefields, u.idnumber, l.actioncount AS count
-                  FROM (SELECT * FROM {role_assignments} WHERE contextid $relatedctxsql AND roleid = :roleid ) ra
+                  FROM (SELECT DISTINCT userid FROM {role_assignments} WHERE contextid $relatedctxsql AND roleid = :roleid ) ra
                   JOIN {user} u ON u.id = ra.userid
              $groupsql
              LEFT JOIN (