friendica
/
friendica
mirror of https://git.friendi.ca/friendica/friendica.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #2458 from annando/1603-smilies 

Bugfix: Messages work now again
pull/2460/head^2
Tobias Diekershoff 2016-04-18 05:52:00 +02:00
parent dde600c0f5 0f24f2d9ae
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/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'];
}