aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-09-30 21:31:31 -0700
committerfriendica <info@friendica.com>2014-09-30 21:31:31 -0700
commit79f1d48e194f9989f5b76168496a444d0af1e36e (patch)
tree6ace96ec6d15986a3177b0ec926c0e4a7195b802 /include
parentcb44d015f3c3b0f0a8835d4391d5cea0041d1eed (diff)
parente12872fdaebeba83483bae217425118b3b6b65d3 (diff)
downloadvolse-hubzilla-79f1d48e194f9989f5b76168496a444d0af1e36e.tar.gz
volse-hubzilla-79f1d48e194f9989f5b76168496a444d0af1e36e.tar.bz2
volse-hubzilla-79f1d48e194f9989f5b76168496a444d0af1e36e.zip
Merge https://github.com/friendica/red into pending_merge
Diffstat (limited to 'include')
-rw-r--r--include/conversation.php6
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')),