aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-05-24 20:41:29 -0700
committerFriendika <info@friendika.com>2011-05-24 20:41:29 -0700
commit87de83997499a380ef26d72acb6d5fd3df91e95b (patch)
treefdfe20c08b8ec5e49232731c93a7dec865161758 /include
parent44477397024df511b5b72fdace60978dd7816fb6 (diff)
downloadvolse-hubzilla-87de83997499a380ef26d72acb6d5fd3df91e95b.tar.gz
volse-hubzilla-87de83997499a380ef26d72acb6d5fd3df91e95b.tar.bz2
volse-hubzilla-87de83997499a380ef26d72acb6d5fd3df91e95b.zip
attachment display
Diffstat (limited to 'include')
-rw-r--r--include/conversation.php9
1 files changed, 7 insertions, 2 deletions
diff --git a/include/conversation.php b/include/conversation.php
index 4fa4b92ad..742df20cb 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -183,6 +183,8 @@ function conversation(&$a, $items, $mode, $update) {
$drop = replace_macros($droptpl,array('$id' => $item['id']));
$lock = '<div class="wall-item-lock"></div>';
+
+ $body = prepare_body($item);
$o .= replace_macros($tpl,array(
'$id' => $item['item_id'],
@@ -194,7 +196,7 @@ function conversation(&$a, $items, $mode, $update) {
'$lock' => $lock,
'$thumb' => $profile_avatar,
'$title' => $item['title'],
- '$body' => smilies(bbcode($item['body'])),
+ '$body' => $body,
'$ago' => relative_date($item['created']),
'$location' => $location,
'$indent' => '',
@@ -441,6 +443,9 @@ function conversation(&$a, $items, $mode, $update) {
// Build the HTML
+ $body = prepare_body($item);
+
+
$tmp_item = replace_macros($template,array(
'$id' => $item['item_id'],
'$linktitle' => sprintf( t('View %s\'s profile'), $profile_name),
@@ -455,7 +460,7 @@ function conversation(&$a, $items, $mode, $update) {
'$osparkle' => $osparkle,
'$sparkle' => $sparkle,
'$title' => $item['title'],
- '$body' => smilies(bbcode($item['body'])),
+ '$body' => $body,
'$ago' => relative_date($item['created']),
'$lock' => $lock,
'$location' => $location,