MDL-68070 messaging: Fix error when personal notification is disabled

moodle · Oct 12, 2020 · bf17107 · bf17107
1 parent 46f977a
commit bf17107
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/lang/en/error.php b/lang/en/error.php
@@ -391,6 +391,7 @@
 $string['maxbytesfile'] = 'The file {$a->file} is too large. The maximum size you can upload is {$a->size}.';
 $string['maxareabytes'] = 'The file is larger than the space remaining in this area.';
 $string['messagingdisable'] = 'Messaging is disabled on this site';
+$string['messageundeliveredbynotificationsettings'] = 'Message failed to deliver. Please check the notification settings.';
 $string['mimetexisnotexist'] = 'Your system is not configured to run mimeTeX. You need to obtain the C source from <a href="https://www.forkosh.com/mimetex.zip">https://www.forkosh.com/mimetex.zip</a>, compile it and put the executable into your moodle/filter/tex/ directory.';
 $string['mimetexnotexecutable'] = 'Custom mimetex is not executable!';
 $string['missingfield'] = 'Field "{$a}" is missing';

diff --git a/message/classes/api.php b/message/classes/api.php
@@ -1699,6 +1699,10 @@ public static function send_message_to_conversation(int $userid, int $conversati
 
         $messageid = message_send($eventdata);
 
+        if (!$messageid) {
+            throw new \moodle_exception('messageundeliveredbynotificationsettings', 'moodle');
+        }
+
         $messagerecord = $DB->get_record('messages', ['id' => $messageid], 'id, useridfrom, fullmessage,
                 timecreated, fullmessagetrust');
         $message = (object) [