]> git.mjollnir.org Git - moodle.git/commitdiff
MDL-13314 count_role_users was showing different count to those returned from
authorpoltawski <poltawski>
Tue, 5 Feb 2008 17:19:41 +0000 (17:19 +0000)
committerpoltawski <poltawski>
Tue, 5 Feb 2008 17:19:41 +0000 (17:19 +0000)
get_role_users(), based on patch from Patrick Pollett
merged from MOODLE_19_STABLE

lib/accesslib.php

index 7a663448993926964786f3e1767f7f4663a7ae0e..e550f46c1b55ccbef2e5b4d80a46b47de958f35b 100755 (executable)
@@ -4927,10 +4927,13 @@ function count_role_users($roleid, $context, $parent=false) {
         $parentcontexts = '';
     }
 
-    $SQL = "SELECT count(*)
-            FROM {$CFG->prefix}role_assignments r
-            WHERE (r.contextid = $context->id $parentcontexts)
-            AND r.roleid = $roleid";
+    $SQL = "SELECT count(u.id)
+        FROM {$CFG->prefix}role_assignments r
+        JOIN {$CFG->prefix}user u 
+          ON u.id = r.userid
+        WHERE (r.contextid = $context->id $parentcontexts)
+        AND r.roleid = $roleid
+        AND u.deleted = 0";
 
     return count_records_sql($SQL);
 }