MDL-12437, sorting by names adds teacher to gradebook list

diff --git a/grade/report/grader/lib.php b/grade/report/grader/lib.php
index d01e8ca059e4a3482ee0fef32f771a644817f105..aab20c7a9f637f4082a1e66174f5d626404a725d 100644 (file)
--- a/grade/report/grader/lib.php
+++ b/grade/report/grader/lib.php
@@ -303,7 +303,8 @@ class grade_report_grader extends grade_report {
             } elseif ($this->sortitemid == 'firstname') {
                 $sort2 = ', u.lastname ' . $this->sortorder;
             }
-            $this->users = get_role_users($this->gradebookroles, $this->context, false,
+            $roles = explode(',', $this->gradebookroles);
+            $this->users = get_role_users($roles, $this->context, false,
                             'u.id, u.firstname, u.lastname', 'u.'.$this->sortitemid .' '. $this->sortorder . $sort2,
                             false, $this->currentgroup, $this->page * $this->get_pref('studentsperpage'), $this->get_pref('studentsperpage'));
 

diff --git a/lib/accesslib.php b/lib/accesslib.php
index 6be26882ca65909e9da72e78cc7718c7e8866d24..c2528dce2fd9cc62141518f1a29ad2934f64b7bb 100755 (executable)
--- a/lib/accesslib.php
+++ b/lib/accesslib.php
@@ -4343,7 +4343,7 @@ function get_role_users($roleid, $context, $parent=false, $fields='', $sort='u.l
 
     if (is_array($roleid)) {
         $roleselect = ' AND ra.roleid IN (' . implode(',',$roleid) .')';
-    } elseif (is_int($roleid)) {
+    } elseif (!empty($roleid)) { // should not test for int, because it can come in as a string
         $roleselect = "AND ra.roleid = $roleid";
     } else {
         $roleselect = '';