diff --git a/mod/message.php b/mod/message.php index 734bf34710..8c4151542d 100644 --- a/mod/message.php +++ b/mod/message.php @@ -2,6 +2,7 @@ require_once('include/acl_selectors.php'); require_once('include/message.php'); +require_once('include/Smilies.php'); function message_init(&$a) { @@ -460,13 +461,13 @@ function message_content(&$a) { if($a->theme['template_engine'] === 'internal') { $from_name_e = template_escape($message['from-name']); $subject_e = template_escape($message['title']); - $body_e = template_escape(smilies(bbcode($message['body']))); + $body_e = template_escape(Smilies::replace(bbcode($message['body']))); $to_name_e = template_escape($message['name']); } else { $from_name_e = $message['from-name']; $subject_e = $message['title']; - $body_e = smilies(bbcode($message['body'])); + $body_e = Smilies::replace(bbcode($message['body'])); $to_name_e = $message['name']; }