Merge branch 'MDL-61196_34' of git://github.com/markn86/moodle into M…

…OODLE_34_STABLE
moodle · Mar 2, 2018 · a40d205 · a40d205
2 parents 6b1a68d + 2f2d7e6
commit a40d205
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/message/output/popup/classes/output/popup_notification.php b/message/output/popup/classes/output/popup_notification.php
@@ -70,6 +70,10 @@ public function export_for_template(\renderer_base $output) {
         $context->timecreatedpretty = get_string('ago', 'message', format_time(time() - $context->timecreated));
         $context->text = message_format_message_text($context);
         $context->read = $context->timeread ? true : false;
+
+        // Need to strip any HTML from these.
+        $context->subject = clean_param($context->subject, PARAM_TEXT);
+        $context->contexturlname = clean_param($context->contexturlname, PARAM_TEXT);
         $context->shortenedsubject = shorten_text($context->subject, 125);
 
         if (!empty($context->component) && substr($context->component, 0, 4) == 'mod_') {