Merged from stable branch

diff --git a/mod/assignment/lib.php b/mod/assignment/lib.php
index 097cd1a3e8a5eb589238d8624e0d4656ccf2d630..4ed4aa54664729484256a660c3e3da8227527809 100644 (file)
--- a/mod/assignment/lib.php
+++ b/mod/assignment/lib.php
@@ -416,7 +416,7 @@ function assignment_count_real_submissions($assignment, $groupid=0) {
     global $CFG;
 
     if ($groupid) {     /// How many in a particular group?
-        return count_records_sql("SELECT COUNT(*) 
+        return count_records_sql("SELECT COUNT(DISTINCT g.userid, g.groupid)
                                      FROM {$CFG->prefix}assignment_submissions a,
                                           {$CFG->prefix}groups_members g
                                     WHERE a.assignment = $assignment->id