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

This commit is contained in:
Aparup Banerjee 2011-11-22 01:15:26 +08:00
commit 85227804b4

View file

@ -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 = '';