From 3047f140ded99643f2d7bfc78eed62318d5094d9 Mon Sep 17 00:00:00 2001 From: Andrew Nicols Date: Mon, 10 Feb 2014 21:14:13 +0800 Subject: [PATCH 1/2] MDL-44055 mod_quiz: Add missing alternate name fields --- mod/quiz/lib.php | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/mod/quiz/lib.php b/mod/quiz/lib.php index 6dac7386ebd..b29ae777f4c 100644 --- a/mod/quiz/lib.php +++ b/mod/quiz/lib.php @@ -847,9 +847,10 @@ function quiz_get_recent_mod_activity(&$activities, &$index, $timestart, $params['timestart'] = $timestart; $params['quizid'] = $quiz->id; + $ufields = user_picture::fields('u'); if (!$attempts = $DB->get_records_sql(" SELECT qa.*, - u.firstname, u.lastname, u.email, u.picture, u.imagealt + {$ufields} FROM {quiz_attempts} qa JOIN {user} u ON u.id = qa.userid $groupjoin @@ -919,14 +920,9 @@ function quiz_get_recent_mod_activity(&$activities, &$index, $timestart, $tmpactivity->content->maxgrade = null; } - $tmpactivity->user = new stdClass(); - $tmpactivity->user->id = $attempt->userid; - $tmpactivity->user->firstname = $attempt->firstname; - $tmpactivity->user->lastname = $attempt->lastname; - $tmpactivity->user->fullname = fullname($attempt, $viewfullnames); - $tmpactivity->user->picture = $attempt->picture; - $tmpactivity->user->imagealt = $attempt->imagealt; - $tmpactivity->user->email = $attempt->email; + $tmpactivity->user = username_load_fields_from_object(new stdClass(), $attempt, null, + explode(',', user_picture::fields())); + $tmpactivity->user->fullname = fullname($tmpactivity->user, $viewfullnames); $activities[$index++] = $tmpactivity; } From cb0f82ddf9734526517a61eea0687329186943f9 Mon Sep 17 00:00:00 2001 From: Andrew Nicols Date: Mon, 10 Feb 2014 21:24:13 +0800 Subject: [PATCH 2/2] MDL-44055 mod_glossary: Add missing alternate name fields --- mod/glossary/lib.php | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/mod/glossary/lib.php b/mod/glossary/lib.php index 9b8897600bc..ac66183df91 100644 --- a/mod/glossary/lib.php +++ b/mod/glossary/lib.php @@ -364,7 +364,7 @@ function glossary_get_recent_mod_activity(&$activities, &$index, $timestart, $co $params['timestart'] = $timestart; $params['glossaryid'] = $cm->instance; - $ufields = user_picture::fields('u', array('lastaccess', 'firstname', 'lastname', 'email', 'picture', 'imagealt')); + $ufields = user_picture::fields('u'); $entries = $DB->get_records_sql(" SELECT ge.id AS entryid, ge.*, $ufields FROM {glossary_entries} ge @@ -399,6 +399,9 @@ function glossary_get_recent_mod_activity(&$activities, &$index, $timestart, $co } $tmpactivity = new stdClass(); + $tmpactivity->user = username_load_fields_from_object(new stdClass(), $entry, null, + explode(',', user_picture::fields())); + $tmpactivity->user->fullname = fullname($tmpactivity->user, $viewfullnames); $tmpactivity->type = 'glossary'; $tmpactivity->cmid = $cm->id; $tmpactivity->glossaryid = $entry->glossaryid; @@ -409,14 +412,6 @@ function glossary_get_recent_mod_activity(&$activities, &$index, $timestart, $co $tmpactivity->content->entryid = $entry->entryid; $tmpactivity->content->concept = $entry->concept; $tmpactivity->content->definition = $entry->definition; - $tmpactivity->user = new stdClass(); - $tmpactivity->user->id = $entry->userid; - $tmpactivity->user->firstname = $entry->firstname; - $tmpactivity->user->lastname = $entry->lastname; - $tmpactivity->user->fullname = fullname($entry, $viewfullnames); - $tmpactivity->user->picture = $entry->picture; - $tmpactivity->user->imagealt = $entry->imagealt; - $tmpactivity->user->email = $entry->email; $activities[$index++] = $tmpactivity; }