diff options
| author | Thomas Willingham <founder@kakste.com> | 2013-12-18 18:21:47 +0000 |
|---|---|---|
| committer | Thomas Willingham <founder@kakste.com> | 2013-12-18 18:21:47 +0000 |
| commit | 7ac00d02d110ec2f2d33779d8316e17c13cda149 (patch) | |
| tree | 03b41e86e0790895fe56488beea2b5f554fbaeae /mod/page.php | |
| parent | 733cb37ef14eb4dd5408e1a8c453f13cd41952eb (diff) | |
| parent | df34aaba4733b1c38ac2b8b9c19c5a945d5a841b (diff) | |
| download | volse-hubzilla-7ac00d02d110ec2f2d33779d8316e17c13cda149.tar.gz volse-hubzilla-7ac00d02d110ec2f2d33779d8316e17c13cda149.tar.bz2 volse-hubzilla-7ac00d02d110ec2f2d33779d8316e17c13cda149.zip | |
Merge remote-tracking branch 'upstream/master'
Conflicts:
mod/page.php
Diffstat (limited to 'mod/page.php')
| -rw-r--r-- | mod/page.php | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/mod/page.php b/mod/page.php index fdb8ee38f..df17dbf52 100644 --- a/mod/page.php +++ b/mod/page.php @@ -112,16 +112,7 @@ function page_content(&$a) { xchan_query($r); $r = fetch_post_tags($r,true); - $body = prepare_body($r[0],true); + $o .= prepare_page($r[0]); + return $o; - - return $o . replace_macros(get_markup_template('page_display.tpl'),array( - '$author' => (($naked) ? '' : $item['author']['xchan_name']), - '$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' => $body - )); } - - |