Merge branch 'wip-MDL-42238-master' of git://github.com/abgreeve/moodle

group/lib.php

@@ -739,7 +739,8 @@ function groups_get_potential_members($courseid, $roleid = null, $cohortid = nul
         $cohortjoin = "";
     }
 
-    $sql = "SELECT u.id, u.username, u.firstname, u.lastname, u.idnumber
+    $allusernamefields = get_all_user_name_fields(true, 'u');
+    $sql = "SELECT u.id, u.username, $allusernamefields, u.idnumber
               FROM {user} u
               JOIN ($esql) e ON e.id = u.id
        $cohortjoin

mod/forum/lib.php

@@ -1511,9 +1511,9 @@ function forum_print_recent_activity($course, $viewfullnames, $timestart) {
 
     // do not use log table if possible, it may be huge and is expensive to join with other tables
 
+    $allnamefields = user_picture::fields('u', null, 'duserid');
     if (!$posts = $DB->get_records_sql("SELECT p.*, f.type AS forumtype, d.forum, d.groupid,
-                                              d.timestart, d.timeend, d.userid AS duserid,
-                                              u.firstname, u.lastname, u.email, u.picture
+                                              d.timestart, d.timeend, $allnamefields
                                          FROM {forum_posts} p
                                               JOIN {forum_discussions} d ON d.id = p.discussion
                                               JOIN {forum} f             ON f.id = d.forum

mod/wiki/lib.php

@@ -279,10 +279,12 @@ function wiki_supports($feature) {
 function wiki_print_recent_activity($course, $viewfullnames, $timestart) {
     global $CFG, $DB, $OUTPUT;
 
-    $sql = "SELECT p.*, w.id as wikiid, sw.groupid
+    $usernamefields = get_all_user_name_fields(true, 'u');
+    $sql = "SELECT p.*, w.id as wikiid, sw.groupid, $usernamefields
             FROM {wiki_pages} p
                 JOIN {wiki_subwikis} sw ON sw.id = p.subwikiid
                 JOIN {wiki} w ON w.id = sw.wikiid
+                JOIN {user} u ON u.id = sw.userid
             WHERE p.timemodified > ? AND w.course = ?
             ORDER BY p.timemodified ASC";
     if (!$pages = $DB->get_records_sql($sql, array($timestart, $course->id))) {

question/editlib.php

@@ -564,6 +564,8 @@ class question_bank_creator_name_column extends question_bank_column_base {
                 $tempname = 'creator' . $allname;
                 if (isset($question->$tempname)) {
                     $u->$allname = $question->$tempname;
+                } else {
+                    $u->$allname = '';
                 }
             }
             echo fullname($u);
@@ -615,6 +617,8 @@ class question_bank_modifier_name_column extends question_bank_column_base {
                 $tempname = 'modifier' . $allname;
                 if (isset($question->$tempname)) {
                     $u->$allname = $question->$tempname;
+                } else {
+                    $u->$allname = '';
                 }
             }
             echo fullname($u);