Merge branch 'wip-MDL-50824-master' of https://github.com/cdsmith-umn/moodle

2016-06-06 15:07:01 +01:00
parent 015b4d22a2 126a4bc47b
commit 4bfeaf2d5f
1 changed files with 2 additions and 1 deletions
@@ -137,7 +137,8 @@ class core_message_external extends external_api {
            if ($success && empty($contactlist[$message['touserid']]) && !empty($blocknoncontacts)) {
                // The user isn't a contact and they have selected to block non contacts so this message won't be sent.
                $success = false;
-                $errormessage = get_string('userisblockingyounoncontact', 'message');
+                $errormessage = get_string('userisblockingyounoncontact', 'message',
+                        fullname(core_user::get_user($message['touserid'])));
            }

            //now we can send the message (at least try)