Merge branch 'm25_MDL-45623' of git://github.com/totara/moodle into MOODLE_25_STABLE

2014-05-26 09:58:53 +12:00
parent e79f1f25ba 8b87f5215a
commit bf01021815
1 changed files with 2 additions and 1 deletions
@@ -75,7 +75,8 @@
                $a->id = $roleid;
                $a->name = $roles[$roleid]->name;
                $a->shortname = $roles[$roleid]->shortname;
-                $a->count = $DB->count_records('role_assignments', array('roleid'=>$roleid));
+                $a->count = $DB->count_records_select('role_assignments',
+                    'roleid = ?', array($roleid), 'COUNT(DISTINCT userid)');

                $formcontinue = new single_button(new moodle_url($baseurl, $optionsyes), get_string('yes'));
                $formcancel = new single_button(new moodle_url($baseurl), get_string('no'), 'get');