]> git.mxchange.org Git - friendica.git/commitdiff
Bugfix: Messages work now again
authorMichael Vogel <icarus@dabo.de>
Sun, 17 Apr 2016 20:07:01 +0000 (22:07 +0200)
committerMichael Vogel <icarus@dabo.de>
Sun, 17 Apr 2016 20:07:01 +0000 (22:07 +0200)
mod/message.php

index 734bf3471017dd49560daa474f68a718ed3d466c..8c4151542d1185d476ebc84f5a21f5072cebd13f 100644 (file)
@@ -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'];
                        }