Merge branch 'MDL-29814_blank_emails2_20' of git://github.com/andyjdavis/moodle into MOODLE_20_STABLE

2011-11-22 01:22:20 +08:00
parent 6c5fe9f7e9 878ff40575
commit e239fd37b8
1 changed files with 3 additions and 1 deletions
@@ -1944,8 +1944,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  = '';