MDL-17991 Fixed a bug with the user selector

diff --git a/grade/lib.php b/grade/lib.php
index bd036ec835f78d5f4496f110b24965ef1d04c665..0fb08c4b952ad81a05dfee7099e24b8ec5903bf8 100644 (file)
--- a/grade/lib.php
+++ b/grade/lib.php
@@ -299,7 +299,7 @@ function print_graded_users_selector($course, $actionpage, $userid=null, $return
         $menu[0] .= " (" . (count($menu) - 1) . ")";
     }
 
-    return popup_form($CFG->wwwroot.'/grade/' . $actionpage . '&userid=', $menu, 'choosegradeduser', $userid, 'choose', '', '',
+    return popup_form($CFG->wwwroot.'/grade/' . $actionpage . '&userid=', $menu, 'choosegradeduser', $userid, null, '', '',
                         $return, 'self', get_string('selectalloroneuser', 'grades'));
 }
 

diff --git a/grade/report/user/lib.php b/grade/report/user/lib.php
index 49ba8a61d70d89d69ace9cdaca89942fcc511307..7ce1fecd5ab80a2e63edf0fb5dce9bd782de1848 100644 (file)
--- a/grade/report/user/lib.php
+++ b/grade/report/user/lib.php
@@ -191,7 +191,7 @@ class grade_report_user extends grade_report {
     }
 
     private function fill_table_recursive(&$element) {
-        global $CFG;
+        global $CFG, $DB;
 
         $type = $element['type'];
         $depth = $element['depth'];
@@ -288,7 +288,7 @@ class grade_report_user extends grade_report {
                               FROM {grade_grades}
                              WHERE finalgrade > ?
                                    AND itemid = ?";
-                    $rank = $DB->count_records_sql($sql, array($grade_grade->finalgrade, $grade_item->id)) + 1;
+                    $rank = $DB->count_records_sql($sql, array($grade_grade->finalgrade, $grade_grade->grade_item->id)) + 1;
 
                     $data['rank']['class'] = $class;
                     $data['rank']['content'] = "$rank/".$this->get_numusers(false); // total course users