harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

oh that's why

Browse Source
This commit is contained in:
friendica 2013-09-02 16:37:54 -07:00
parent 56e408f467
commit dfa2efcecf
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/conversation.php
View File

@ -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'])
));
}

3
include/text.php
View File

@ -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;
}