aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-11-15 15:32:26 -0800
committerfriendica <info@friendica.com>2013-11-15 15:32:26 -0800
commite8c9dafb90e556a9cc9590022ef1131d76b1129d (patch)
tree5625e2884d8eb5d580e11a3dad5c41a7b1cad05e
parent0f93174b61b9200c65f6d42727013a3b810cbe88 (diff)
downloadvolse-hubzilla-e8c9dafb90e556a9cc9590022ef1131d76b1129d.tar.gz
volse-hubzilla-e8c9dafb90e556a9cc9590022ef1131d76b1129d.tar.bz2
volse-hubzilla-e8c9dafb90e556a9cc9590022ef1131d76b1129d.zip
revert to prepare_page - but have it call prepare_body
-rw-r--r--include/conversation.php2
-rw-r--r--mod/page.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/include/conversation.php b/include/conversation.php
index fea53015e..a2eeda25b 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -1301,7 +1301,7 @@ function prepare_page($item) {
'$auth_url' => (($naked) ? '' : $item['author']['xchan_url']),
'$date' => (($naked) ? '' : datetime_convert('UTC',date_default_timezone_get(),$item['created'],'Y-m-d H:i')),
'$title' => smilies(bbcode($item['title'])),
- '$body' => prepare_text($item['body'],$item['mimetype'])
+ '$body' => prepare_body($item,true)
));
}
diff --git a/mod/page.php b/mod/page.php
index 403016eb2..df17dbf52 100644
--- a/mod/page.php
+++ b/mod/page.php
@@ -112,7 +112,7 @@ function page_content(&$a) {
xchan_query($r);
$r = fetch_post_tags($r,true);
- $o .= prepare_body($r[0],true);
+ $o .= prepare_page($r[0]);
return $o;
}