aboutsummaryrefslogtreecommitdiffstats
path: root/mod/profile.php
diff options
context:
space:
mode:
authorroot <root@diekershoff.homeunix.net>2010-12-09 11:56:26 +0100
committerroot <root@diekershoff.homeunix.net>2010-12-09 11:56:26 +0100
commit037cd5d80993dedfccfe9ef25679c54297ef1546 (patch)
treee524a4fd78c1e3348bf8854b7000c65faaf2046f /mod/profile.php
parenta96da925712184eec97f6ca01072b7c2bee92a7e (diff)
parent03c1e5a5ad764d5cfaa03fffdc9e80222f70088e (diff)
downloadvolse-hubzilla-037cd5d80993dedfccfe9ef25679c54297ef1546.tar.gz
volse-hubzilla-037cd5d80993dedfccfe9ef25679c54297ef1546.tar.bz2
volse-hubzilla-037cd5d80993dedfccfe9ef25679c54297ef1546.zip
Merge branch 'master' of git://github.com/friendika/friendika
Diffstat (limited to 'mod/profile.php')
-rw-r--r--mod/profile.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/mod/profile.php b/mod/profile.php
index d09e0187b..a431f4bdd 100644
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -388,7 +388,7 @@ function profile_content(&$a, $update = 0) {
'$thumb' => $profile_avatar,
'$sparkle' => $sparkle,
'$title' => $item['title'],
- '$body' => bbcode($item['body']),
+ '$body' => smilies(bbcode($item['body'])),
'$ago' => relative_date($item['created']),
'$lock' => $lock,
'$location' => $location,