diff options
| author | friendica <info@friendica.com> | 2013-12-23 12:01:53 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2013-12-23 12:01:53 -0800 |
| commit | 4517bdcff1aa75c5389f9fb29947012fca5df4e1 (patch) | |
| tree | aef4d726781128dd41d53fcf069caa5ff0e42558 /include | |
| parent | 45a4c649edf0519f1dfbee73cb6ad43211549d52 (diff) | |
| parent | ea31573e26a5f74b27530fc0829c9b9abca0f65c (diff) | |
| download | volse-hubzilla-4517bdcff1aa75c5389f9fb29947012fca5df4e1.tar.gz volse-hubzilla-4517bdcff1aa75c5389f9fb29947012fca5df4e1.tar.bz2 volse-hubzilla-4517bdcff1aa75c5389f9fb29947012fca5df4e1.zip | |
Merge https://github.com/friendica/red into zpull
Diffstat (limited to 'include')
| -rw-r--r-- | include/conversation.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/conversation.php b/include/conversation.php index d602174b0..99252027d 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1296,15 +1296,18 @@ function prepare_page($item) { $a = get_app(); $naked = ((get_pconfig($item['uid'],'system','nakedpage')) ? 1 : 0); + $observer = $a->get_observer(); + $zid = ($observer['xchan_addr']); + if(array_key_exists('webpage',$a->layout) && array_key_exists('authored',$a->layout['webpage'])) { if($a->layout['webpage']['authored'] === 'none') $naked = 1; // ... other possible options } - return replace_macros(get_markup_template('page_display.tpl'),array( '$author' => (($naked) ? '' : $item['author']['xchan_name']), '$auth_url' => (($naked) ? '' : $item['author']['xchan_url']), + '$zid' => $zid, '$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) |