From 51294319af4b4a02aa817b1106e353b415581bf4 Mon Sep 17 00:00:00 2001
From: Marina Glancy <marina@moodle.com>
Date: Wed, 26 Feb 2014 11:51:21 +0800
Subject: [PATCH] MDL-44362 recentactivity: fix regressions from MDL-44055

---
 mod/glossary/lib.php | 5 ++---
 mod/quiz/lib.php     | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/mod/glossary/lib.php b/mod/glossary/lib.php
index ac66183df91..a4d230e8f4d 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');
+    $ufields = user_picture::fields('u', null, 'useridagain');
     $entries = $DB->get_records_sql("
               SELECT ge.id AS entryid, ge.*, $ufields
                 FROM {glossary_entries} ge
@@ -399,8 +399,7 @@ 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                 = user_picture::unalias($entry, null, 'useridagain');
         $tmpactivity->user->fullname       = fullname($tmpactivity->user, $viewfullnames);
         $tmpactivity->type                 = 'glossary';
         $tmpactivity->cmid                 = $cm->id;
diff --git a/mod/quiz/lib.php b/mod/quiz/lib.php
index 8f633cadb9e..5992a595f43 100644
--- a/mod/quiz/lib.php
+++ b/mod/quiz/lib.php
@@ -847,7 +847,7 @@ function quiz_get_recent_mod_activity(&$activities, &$index, $timestart,
     $params['timestart'] = $timestart;
     $params['quizid'] = $quiz->id;
 
-    $ufields = user_picture::fields('u');
+    $ufields = user_picture::fields('u', null, 'useridagain');
     if (!$attempts = $DB->get_records_sql("
               SELECT qa.*,
                      {$ufields}
@@ -920,8 +920,7 @@ function quiz_get_recent_mod_activity(&$activities, &$index, $timestart,
             $tmpactivity->content->maxgrade  = null;
         }
 
-        $tmpactivity->user = username_load_fields_from_object(new stdClass(), $attempt, null,
-                explode(',', user_picture::fields()));
+        $tmpactivity->user = user_picture::unalias($attempt, null, 'useridagain');
         $tmpactivity->user->fullname  = fullname($tmpactivity->user, $viewfullnames);
 
         $activities[$index++] = $tmpactivity;