L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'wip-MDL-44362-master' of git://github.com/marinaglancy/moodle

Browse Source
This commit is contained in:
Dan Poltawski
2014-03-03 13:33:40 +08:00
parent 5c45ea0c6b 21d2280361
commit a8b07dbf98
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/moodlelib.php
+2
View File
@@ -3689,6 +3689,8 @@ function get_all_user_name_fields($returnsql = false, $tableprefix = null, $pref
/**
* Reduces lines of duplicated code for getting user name fields.
*
* See also {@link user_picture::unalias()}
*
* @param object $addtoobject Object to add user name fields to.
* @param object $secondobject Object that contains user name field information.
* @param string $prefix prefix to be added to all fields (including $additionalfields) e.g. authorfirstname.
mod/glossary/lib.php
+2 -3
View File
@@ -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;
mod/quiz/lib.php
+2 -3
View File
@@ -854,7 +854,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}
@@ -927,8 +927,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;