Merge branch 'MDL-82932-main' of https://github.com/PhMemmel/moodle

This commit is contained in:
Huong Nguyen 2024-11-28 09:27:45 +07:00
commit 282f9dc2ad
No known key found for this signature in database
GPG Key ID: 40D88AB693A3E72A

View File

@ -123,9 +123,10 @@ class utils {
}
if ($userdetails) { // Add user details to the export data.
$userdata = get_complete_user_data('id', $record->userid);
$exporter->add_to_current_row(fullname($userdata));
$exporter->add_to_current_row($userdata->username);
$exporter->add_to_current_row($userdata->email);
// In case of an already deleted user, we do not receive any userdata and export an empty string instead.
$exporter->add_to_current_row($userdata ? fullname($userdata) : '');
$exporter->add_to_current_row($userdata ? $userdata->username : '');
$exporter->add_to_current_row($userdata ? $userdata->email : '');
}
if ($time) { // Add time added / modified.
$exporter->add_to_current_row(userdate($record->timecreated));