mirror of
https://github.com/moodle/moodle.git
synced 2025-03-19 23:20:09 +01:00
Merge branch 'MDL-31804_ambiguous_sql' of git://github.com/andyjdavis/moodle
This commit is contained in:
commit
1af542ed67
@ -391,8 +391,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;
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user