diff options
| author | tuscanhobbit <tuscanhobbit@users.noreply.github.com> | 2014-10-01 19:26:21 +0200 |
|---|---|---|
| committer | tuscanhobbit <tuscanhobbit@users.noreply.github.com> | 2014-10-01 19:26:21 +0200 |
| commit | 9cce852ac71fcd12970e985f1f61697333849172 (patch) | |
| tree | c40ce5543c412035ca03188f7bd9e565efb62117 /include/conversation.php | |
| parent | a548f644d05f330a2b70c87df821bce05007c979 (diff) | |
| parent | f19d718631675d38efca1741f46bf0916af72a65 (diff) | |
| download | volse-hubzilla-9cce852ac71fcd12970e985f1f61697333849172.tar.gz volse-hubzilla-9cce852ac71fcd12970e985f1f61697333849172.tar.bz2 volse-hubzilla-9cce852ac71fcd12970e985f1f61697333849172.zip | |
Merge from upstream
Diffstat (limited to 'include/conversation.php')
| -rw-r--r-- | include/conversation.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/conversation.php b/include/conversation.php index b0a388a68..92ba18d13 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1341,8 +1341,10 @@ function prepare_page($item) { // the template will get passed an unobscured title. $body = prepare_body($item,true); - - return replace_macros(get_markup_template('page_display.tpl'),array( + $tpl = get_pconfig($item['uid'],'system','pagetemplate'); + if (! $tpl) + $tpl = 'page_display.tpl'; + return replace_macros(get_markup_template($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')), |