diff options
| author | friendica <info@friendica.com> | 2013-09-02 16:37:54 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2013-09-02 16:37:54 -0700 |
| commit | dfa2efcecf976783c4fa06f4301a851eca8e97c6 (patch) | |
| tree | fb75a8dcf1efd63e0739b7341f1113fa616dca31 /include | |
| parent | 56e408f4679862a0d7d9d8fa46a1875f2cbf3574 (diff) | |
| download | volse-hubzilla-dfa2efcecf976783c4fa06f4301a851eca8e97c6.tar.gz volse-hubzilla-dfa2efcecf976783c4fa06f4301a851eca8e97c6.tar.bz2 volse-hubzilla-dfa2efcecf976783c4fa06f4301a851eca8e97c6.zip | |
oh that's why
Diffstat (limited to 'include')
| -rw-r--r-- | include/conversation.php | 3 | ||||
| -rwxr-xr-x | 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; } |