Merge branch 'MDL-31804_ambiguous_sql_22' of git://github.com/andyjda…

…vis/moodle into MOODLE_22_STABLE
moodle · May 14, 2012 · 7e64744 · 7e64744
2 parents 97bb109 + d5e59d8
commit 7e64744
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/grade/report/grader/lib.php b/grade/report/grader/lib.php
@@ -339,8 +339,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 = user_picture::fields('u', get_extra_user_fields($this->context));
-        $userfields .= get_extra_user_fields_sql($this->context);
 
         $sortjoin = $sort = $params = null;