diff options
| author | root <root@diekershoff.homeunix.net> | 2011-01-18 11:14:28 +0100 |
|---|---|---|
| committer | root <root@diekershoff.homeunix.net> | 2011-01-18 11:14:28 +0100 |
| commit | 13fa27f7578d292d8d722554ce6211e8e0bc91af (patch) | |
| tree | 2377a23718c3406206f03b65aad2a9f5b1eb8b12 /mod/message.php | |
| parent | 3323f256c35ceb30a4b2ac1984a2eded672eb33f (diff) | |
| parent | 028460a5c1de4833bb1dcfaa945c1292952bf923 (diff) | |
| download | volse-hubzilla-13fa27f7578d292d8d722554ce6211e8e0bc91af.tar.gz volse-hubzilla-13fa27f7578d292d8d722554ce6211e8e0bc91af.tar.bz2 volse-hubzilla-13fa27f7578d292d8d722554ce6211e8e0bc91af.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') |