Merge branch 'MDL-79557-401' of https://github.com/jleyva/moodle into…

… MOODLE_401_STABLE
moodle · Oct 3, 2023 · cf98238 · cf98238
2 parents 925c36f + 8d65efe
commit cf98238
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/message/externallib.php b/message/externallib.php
@@ -2134,6 +2134,8 @@ public static function get_messages($useridto, $useridfrom = 0, $type = 'both',
                     $message->usertofullname = $usertofullname;
                 }
 
+                // Clean subject of html.
+                $message->subject = clean_param($message->subject, PARAM_TEXT);
                 $message->text = message_format_message_text($message);
                 $messages[$mid] = (array) $message;
             }

diff --git a/message/tests/externallib_test.php b/message/tests/externallib_test.php
@@ -1437,13 +1437,14 @@ public function test_get_messages() {
         $eventdata->smallmessage      = $eventdata->subject;
         message_send($eventdata);
 
+        // This event contains HTML in the subject field that will be removed by the WS (otherwise it will generate an exception).
         $eventdata = new \core\message\message();
         $eventdata->courseid         = $course->id;
         $eventdata->name             = 'submission';
         $eventdata->component        = 'mod_feedback';
         $eventdata->userfrom         = $user1;
         $eventdata->userto           = $user2;
-        $eventdata->subject          = 'Feedback submitted';
+        $eventdata->subject          = 'Feedback submitted <span>with html</span>';
         $eventdata->fullmessage      = 'Feedback submitted from an user';
         $eventdata->fullmessageformat = FORMAT_PLAIN;
         $eventdata->fullmessagehtml  = '<strong>Feedback submitted</strong>';