aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorRedMatrix <info@friendica.com>2014-10-01 14:11:16 +1000
committerRedMatrix <info@friendica.com>2014-10-01 14:11:16 +1000
commite12872fdaebeba83483bae217425118b3b6b65d3 (patch)
treefcb5cebd9af8458f881251992bd1bca0f8cc6b33 /include
parentbfa4cc8678c32ca85636a9a217bfc40ab9e52444 (diff)
parent9de5b6b9053023d72901c3492e602dcae69c7cc6 (diff)
downloadvolse-hubzilla-e12872fdaebeba83483bae217425118b3b6b65d3.tar.gz
volse-hubzilla-e12872fdaebeba83483bae217425118b3b6b65d3.tar.bz2
volse-hubzilla-e12872fdaebeba83483bae217425118b3b6b65d3.zip
Merge pull request #608 from beardy-unixer/master
Pluggable page templates
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')),