From dda60f88cd01c99750b947ce9695946ef35d9a5c Mon Sep 17 00:00:00 2001
From: Adrian Greeve <adrian@moodle.com>
Date: Thu, 10 Oct 2013 12:37:54 +0800
Subject: [PATCH 1/4] MDL-42238 - mod_forum: Alternate name sql update to
 forum_print_recent_activity.

---
 mod/forum/lib.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mod/forum/lib.php b/mod/forum/lib.php
index e737d9b2b9c..c9c86d90e27 100644
--- a/mod/forum/lib.php
+++ b/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

From 6d3d9bd927d5386b1dc4fbbcb7db5559efa7a5cd Mon Sep 17 00:00:00 2001
From: Adrian Greeve <adrian@moodle.com>
Date: Thu, 10 Oct 2013 13:18:11 +0800
Subject: [PATCH 2/4] MDL-42238 - mod_wiki: Alternate name sql update to
 wiki_print_recent_activity

---
 mod/wiki/lib.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/mod/wiki/lib.php b/mod/wiki/lib.php
index 95de2f36f30..375669e3407 100644
--- a/mod/wiki/lib.php
+++ b/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))) {

From 60f55a2f727d3e0d490251f22bb5693e45fba18e Mon Sep 17 00:00:00 2001
From: Adrian Greeve <adrian@moodle.com>
Date: Thu, 10 Oct 2013 14:05:53 +0800
Subject: [PATCH 3/4] MDL-42238 - Groups: Alternate name sql update to
 groups_get_potential_members().

---
 group/lib.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/group/lib.php b/group/lib.php
index 502bbcd4ce7..22051bcfa9c 100644
--- a/group/lib.php
+++ b/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

From 60e34a02dbee4e7de120836321f0aee10f7a3344 Mon Sep 17 00:00:00 2001
From: Adrian Greeve <adrian@moodle.com>
Date: Thu, 10 Oct 2013 14:06:33 +0800
Subject: [PATCH 4/4] MDL-42238 - mod_quiz: Slight change to the logic to fix
 Alt. name messages.

---
 question/editlib.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/question/editlib.php b/question/editlib.php
index b8d7b3e3a12..765492f5cb1 100644
--- a/question/editlib.php
+++ b/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);