From dfa2efcecf976783c4fa06f4301a851eca8e97c6 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 2 Sep 2013 16:37:54 -0700 Subject: oh that's why --- include/conversation.php | 3 ++- include/text.php | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/include/conversation.php b/include/conversation.php index 8cee4f34f..299cc1431 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1248,12 +1248,13 @@ function render_location_default($item) { function prepare_page($item) { + return replace_macros(get_markup_template('page_display.tpl'),array( '$author' => $item['author']['xchan_name'], '$auth_url' => $item['author']['xchan_url'], '$date' => datetime_convert('UTC',date_default_timezone_get(),$item['created'],'Y-m-d H:i'), '$title' => smilies(bbcode($item['title'])), - '$body' => smilies(bbcode($item['body'])) + '$body' => prepare_text($item['body'],$item['mimetype']) )); } diff --git a/include/text.php b/include/text.php index 53471f460..bbd538f15 100755 --- a/include/text.php +++ b/include/text.php @@ -1199,7 +1199,8 @@ function prepare_text($text,$content_type = 'text/bbcode') { $s = zidify_links($s); break; } -//logger('prepare: ' . $s); + +//logger('prepare_text: ' . $s); return $s; } -- cgit v1.2.3