moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 08:56:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-71835' of git://github.com/paulholden/moodle

Browse source
This commit is contained in:
Víctor Déniz 2021-08-04 23:22:40 +01:00
commit 6d0a49f51f
1 changed files with 10 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

21
report/log/classes/table_log.php
View file

@ -108,31 +108,30 @@ class report_log_table_log extends table_sql {
* @return string|false * @return string|false
*/ */
protected function get_user_fullname($userid) { protected function get_user_fullname($userid) {
global $DB;
if (empty($userid)) { if (empty($userid)) {
return false; return false;
} }
if (!empty($this->userfullnames[$userid])) { // Check if we already have this users' fullname.
return $this->userfullnames[$userid]; $userfullname = $this->userfullnames[$userid] ?? null;
if (!empty($userfullname)) {
return $userfullname;
} }
// We already looked for the user and it does not exist. // We already looked for the user and it does not exist.
if ($this->userfullnames[$userid] === false) { if ($userfullname === false) {
return false; return false;
} }
// If we reach that point new users logs have been generated since the last users db query. // If we reach that point new users logs have been generated since the last users db query.
list($usql, $uparams) = $DB->get_in_or_equal($userid);
$userfieldsapi = \core_user\fields::for_name(); $userfieldsapi = \core_user\fields::for_name();
$sql = "SELECT id," . $userfieldsapi->get_sql('', false, '', '', false)->selects . $fields = $userfieldsapi->get_sql('', false, '', '', false)->selects;
" FROM {user} WHERE id " . $usql; if ($user = \core_user::get_user($userid, $fields)) {
if (!$user = $DB->get_records_sql($sql, $uparams)) { $this->userfullnames[$userid] = fullname($user, has_capability('moodle/site:viewfullnames', $this->get_context()));
return false; } else {
$this->userfullnames[$userid] = false;
} }
$this->userfullnames[$userid] = fullname($user, has_capability('moodle/site:viewfullnames', $this->get_context()));
return $this->userfullnames[$userid]; return $this->userfullnames[$userid];
} }