Merge branch 'MDL-68279' of https://github.com/paulholden/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 15 Apr 2020 22:27:44 +0000 (00:27 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 15 Apr 2020 22:27:44 +0000 (00:27 +0200)
admin/testoutgoingmailconf.php

index 7d0db03..b1f9c58 100644 (file)
@@ -46,7 +46,8 @@ if ($data) {
     $emailuser->email = $data->recipient;
     $emailuser->id = -99;
 
-    $subject = get_string('testoutgoingmailconf_subject', 'admin', $SITE->fullname);
+    $subject = get_string('testoutgoingmailconf_subject', 'admin',
+        format_string($SITE->fullname, true, ['context' => context_system::instance()]));
     $messagetext = get_string('testoutgoingmailconf_message', 'admin');
 
     // Manage Moodle debugging options.