strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #2458 from annando/1603-smilies

Browse source 
Bugfix: Messages work now again
This commit is contained in:
Tobias Diekershoff 2016-04-18 05:52:00 +02:00
commit 93a11cf839
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
mod/message.php
View file

@ -2,6 +2,7 @@
require_once('include/acl_selectors.php'); require_once('include/acl_selectors.php');
require_once('include/message.php'); require_once('include/message.php');
require_once('include/Smilies.php');
function message_init(&$a) { function message_init(&$a) {
@ -460,13 +461,13 @@ function message_content(&$a) {
if($a->theme['template_engine'] === 'internal') { if($a->theme['template_engine'] === 'internal') {
$from_name_e = template_escape($message['from-name']); $from_name_e = template_escape($message['from-name']);
$subject_e = template_escape($message['title']); $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']); $to_name_e = template_escape($message['name']);
} }
else { else {
$from_name_e = $message['from-name']; $from_name_e = $message['from-name'];
$subject_e = $message['title']; $subject_e = $message['title'];
$body_e = smilies(bbcode($message['body'])); $body_e = Smilies::replace(bbcode($message['body']));
$to_name_e = $message['name']; $to_name_e = $message['name'];
} }