Merge branch 'wip-MDL-59363-32' of git://github.com/marinaglancy/mood…

…le into MOODLE_32_STABLE
moodle · Jul 11, 2017 · bb245a5 · bb245a5
2 parents 8a1518f + c204ffe
commit bb245a5
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/mod/workshop/lib.php b/mod/workshop/lib.php
@@ -1517,7 +1517,8 @@ function workshop_get_file_info($browser, $areas, $course, $cm, $context, $filea
 
         } else {
 
-            $sql = "SELECT s.id, u.lastname, u.firstname
+            $userfields = get_all_user_name_fields(true, 'u');
+            $sql = "SELECT s.id, $userfields
                       FROM {workshop_submissions} s
                       JOIN {user} u ON (s.authorid = u.id)
                      WHERE s.example = 0 AND s.workshopid = ?";