diff options
| author | root <root@diekershoff.homeunix.net> | 2010-12-09 11:56:26 +0100 |
|---|---|---|
| committer | root <root@diekershoff.homeunix.net> | 2010-12-09 11:56:26 +0100 |
| commit | 037cd5d80993dedfccfe9ef25679c54297ef1546 (patch) | |
| tree | e524a4fd78c1e3348bf8854b7000c65faaf2046f /mod/network.php | |
| parent | a96da925712184eec97f6ca01072b7c2bee92a7e (diff) | |
| parent | 03c1e5a5ad764d5cfaa03fffdc9e80222f70088e (diff) | |
| download | volse-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/network.php')
| -rw-r--r-- | mod/network.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mod/network.php b/mod/network.php index c52bb74fc..43c55b8e3 100644 --- a/mod/network.php +++ b/mod/network.php @@ -292,7 +292,7 @@ function network_content(&$a, $update = 0) { '$osparkle' => $osparkle, '$sparkle' => $sparkle, '$title' => $item['title'], - '$body' => bbcode($item['body']), + '$body' => smilies(bbcode($item['body'])), '$ago' => relative_date($item['created']), '$lock' => $lock, '$location' => $location, |