From bb776ef47801ef95363fe7b63995d4d8047f48da Mon Sep 17 00:00:00 2001 From: nicolasconnault Date: Wed, 25 Feb 2009 09:17:48 +0000 Subject: [PATCH] MDL-17991 Fixed a bug with the user selector --- grade/lib.php | 2 +- grade/report/user/lib.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/grade/lib.php b/grade/lib.php index bd036ec835..0fb08c4b95 100644 --- 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 49ba8a61d7..7ce1fecd5a 100644 --- 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 -- 2.39.5