Merge branch 'MDL-31804_ambiguous_sql_22' of git://github.com/andyjdavis/moodle into MOODLE_22_STABLE

2012-05-14 14:20:16 +08:00
parent 97bb109b55 d5e59d8950
commit 7e647445dd
1 changed files with 1 additions and 2 deletions
@@ -339,8 +339,7 @@ class grade_report_grader extends grade_report {
        list($enrolledsql, $enrolledparams) = get_enrolled_sql($this->context);

        //fields we need from the user table
-        $userfields = user_picture::fields('u');
-        $userfields .= get_extra_user_fields_sql($this->context);
+        $userfields = user_picture::fields('u', get_extra_user_fields($this->context));

        $sortjoin = $sort = $params = null;