Merge branch 'MDL-29814_blank_emails2' of git://github.com/andyjdavis…

…/moodle
moodle · Nov 21, 2011 · 8522780 · 8522780
2 parents 7715c88 + 22e23da
commit 8522780
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/message/lib.php b/message/lib.php
@@ -2013,8 +2013,10 @@ function message_post_message($userfrom, $userto, $message, $format) {
     $eventdata->subject          = get_string_manager()->get_string('unreadnewmessage', 'message', fullname($userfrom), $userto->lang);
 
     if ($format == FORMAT_HTML) {
-        $eventdata->fullmessage      = '';
         $eventdata->fullmessagehtml  = $message;
+        //some message processors may revert to sending plain text even if html is supplied
+        //so we keep both plain and html versions if we're intending to send html
+        $eventdata->fullmessage = html_to_text($eventdata->fullmessagehtml);
     } else {
         $eventdata->fullmessage      = $message;
         $eventdata->fullmessagehtml  = '';