diff --git a/admin/tool/dataprivacy/classes/api.php b/admin/tool/dataprivacy/classes/api.php index 33da80e5025..9ae86472274 100644 --- a/admin/tool/dataprivacy/classes/api.php +++ b/admin/tool/dataprivacy/classes/api.php @@ -712,7 +712,7 @@ class api { 'requestedby' => $requestedby->fullname, 'requesttype' => $typetext, 'requestdate' => userdate($requestdata->timecreated), - 'requestorigin' => $SITE->fullname, + 'requestorigin' => format_string($SITE->fullname, true, ['context' => context_system::instance()]), 'requestoriginurl' => new moodle_url('/'), 'requestcomments' => $requestdata->messagehtml, 'datarequestsurl' => $datarequestsurl diff --git a/admin/tool/dataprivacy/classes/task/process_data_request_task.php b/admin/tool/dataprivacy/classes/task/process_data_request_task.php index fe3652f3539..032014cecce 100644 --- a/admin/tool/dataprivacy/classes/task/process_data_request_task.php +++ b/admin/tool/dataprivacy/classes/task/process_data_request_task.php @@ -26,6 +26,7 @@ namespace tool_dataprivacy\task; use action_link; use coding_exception; +use context_system; use core\message\message; use core\task\adhoc_task; use core_user; @@ -180,7 +181,8 @@ class process_data_request_task extends adhoc_task { $message->contexturl = $datarequestsurl; $message->contexturlname = get_string('datarequests', 'tool_dataprivacy'); // Message to the recipient. - $messagetextdata['message'] = get_string('resultdownloadready', 'tool_dataprivacy', $SITE->fullname); + $messagetextdata['message'] = get_string('resultdownloadready', 'tool_dataprivacy', + format_string($SITE->fullname, true, ['context' => context_system::instance()])); // Prepare download link. $downloadurl = moodle_url::make_pluginfile_url($usercontext->id, 'tool_dataprivacy', 'export', $thing->get_itemid(), $thing->get_filepath(), $thing->get_filename(), true); @@ -192,7 +194,8 @@ class process_data_request_task extends adhoc_task { // No point notifying a deleted user in Moodle. $message->notification = 0; // Message to the recipient. - $messagetextdata['message'] = get_string('resultdeleted', 'tool_dataprivacy', $SITE->fullname); + $messagetextdata['message'] = get_string('resultdeleted', 'tool_dataprivacy', + format_string($SITE->fullname, true, ['context' => context_system::instance()])); // Message will be sent to the deleted user via email only. $emailonly = true; break;