diff options
| author | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2011-01-18 11:05:18 +0100 |
|---|---|---|
| committer | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2011-01-18 11:05:18 +0100 |
| commit | 8b997791819ba419e7e2ceb7861bb0e3e37d87dd (patch) | |
| tree | 78b75c13632e9fcaa32f281fb23dcfcd841cf0e1 /mod/message.php | |
| parent | b5c9f80919bd8678521c31913eeb08ccc56914dd (diff) | |
| parent | 028460a5c1de4833bb1dcfaa945c1292952bf923 (diff) | |
| download | volse-hubzilla-8b997791819ba419e7e2ceb7861bb0e3e37d87dd.tar.gz volse-hubzilla-8b997791819ba419e7e2ceb7861bb0e3e37d87dd.tar.bz2 volse-hubzilla-8b997791819ba419e7e2ceb7861bb0e3e37d87dd.zip | |
Merge branch 'master' of git://github.com/friendika/friendika
Diffstat (limited to 'mod/message.php')
| -rw-r--r-- | mod/message.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mod/message.php b/mod/message.php index 251b5a414..9cc2e2826 100644 --- a/mod/message.php +++ b/mod/message.php @@ -270,7 +270,7 @@ function message_content(&$a) { '$sparkle' => $sparkle, '$from_photo' => $message['from-photo'], '$subject' => $message['title'], - '$body' => bbcode($message['body']), + '$body' => smilies(bbcode($message['body'])), '$delete' => t('Delete message'), '$to_name' => $message['name'], '$date' => datetime_convert('UTC',date_default_timezone_get(),$message['created'],'D, d M Y - g:i A') |