diff options
| -rw-r--r-- | include/conversation.php | 5 | ||||
| -rw-r--r-- | mod/page.php | 1 | ||||
| -rw-r--r-- | mod/webpages.php | 1 |
3 files changed, 5 insertions, 2 deletions
diff --git a/include/conversation.php b/include/conversation.php index ee4952d7e..2933842a5 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1314,12 +1314,15 @@ function prepare_page($item) { $naked = 1; // ... other possible options } + + $body = prepare_body($item,true); + return replace_macros(get_markup_template('page_display.tpl'),array( '$author' => (($naked) ? '' : $item['author']['xchan_name']), '$auth_url' => (($naked) ? '' : zid($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_body($item,true), + '$body' => $body, '$preview' => $preview, '$link' => $link, )); diff --git a/mod/page.php b/mod/page.php index df17dbf52..b3f53a227 100644 --- a/mod/page.php +++ b/mod/page.php @@ -111,7 +111,6 @@ function page_content(&$a) { xchan_query($r); $r = fetch_post_tags($r,true); - $o .= prepare_page($r[0]); return $o; diff --git a/mod/webpages.php b/mod/webpages.php index e7c4b40ad..431caa628 100644 --- a/mod/webpages.php +++ b/mod/webpages.php @@ -106,6 +106,7 @@ function webpages_content(&$a) { if($r) { $pages = array(); foreach($r as $rr) { + unobscure($rr); $pages[$rr['iid']][] = array('url' => $rr['iid'],'pagetitle' => $rr['sid'],'title' => $rr['title'],'created' => datetime_convert('UTC',date_default_timezone_get(),$rr['created']),'edited' => datetime_convert('UTC',date_default_timezone_get(),$rr['edited'])); } } |