Merge branch 'MDL-31804_ambiguous_sql' of git://github.com/andyjdavis…

…/moodle
dfsilva · May 14, 2012 · 1af542e · 1af542e
2 parents a225149 + ef8c793
commit 1af542e
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/grade/report/grader/lib.php b/grade/report/grader/lib.php
@@ -391,8 +391,7 @@ public function load_users() {
         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;