From 9ef8ea3a5774251184697ec9e7d1f932901ed745 Mon Sep 17 00:00:00 2001 From: Yuliya Bozhko Date: Tue, 21 Oct 2014 16:15:06 +1300 Subject: [PATCH] MDL-47755 badges: Fix internal message output Signed-off-by: Yuliya Bozhko --- lib/badgeslib.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/badgeslib.php b/lib/badgeslib.php index 41b59c3ddf2..61d0e7b3aad 100644 --- a/lib/badgeslib.php +++ b/lib/badgeslib.php @@ -631,7 +631,7 @@ function badges_notify_badge_award(badge $badge, $userid, $issued, $filepathhash $params->username = fullname($userto); $params->badgelink = $issuedlink; $message = badge_message_from_template($badge->message, $params); - $plaintext = format_text_email($message, FORMAT_HTML); + $plaintext = html_to_text($message); // Notify recipient. $eventdata = new stdClass(); @@ -642,9 +642,9 @@ function badges_notify_badge_award(badge $badge, $userid, $issued, $filepathhash $eventdata->notification = 1; $eventdata->subject = $badge->messagesubject; $eventdata->fullmessage = $plaintext; - $eventdata->fullmessageformat = FORMAT_PLAIN; + $eventdata->fullmessageformat = FORMAT_HTML; $eventdata->fullmessagehtml = $message; - $eventdata->smallmessage = $plaintext; + $eventdata->smallmessage = ''; // Attach badge image if possible. if (!empty($CFG->allowattachments) && $badge->attachment && is_string($filepathhash)) { @@ -677,10 +677,10 @@ function badges_notify_badge_award(badge $badge, $userid, $issued, $filepathhash $eventdata->userto = $creator; $eventdata->notification = 1; $eventdata->subject = $creatorsubject; - $eventdata->fullmessage = format_text_email($creatormessage, FORMAT_HTML); - $eventdata->fullmessageformat = FORMAT_PLAIN; + $eventdata->fullmessage = html_to_text($creatormessage); + $eventdata->fullmessageformat = FORMAT_HTML; $eventdata->fullmessagehtml = $creatormessage; - $eventdata->smallmessage = $creatorsubject; + $eventdata->smallmessage = ''; message_send($eventdata); $DB->set_field('badge_issued', 'issuernotified', time(), array('badgeid' => $badge->id, 'userid' => $userid));