aboutsummaryrefslogtreecommitdiffstats
path: root/include/conversation.php
diff options
context:
space:
mode:
authorgit-marijus <mario@mariovavti.com>2017-04-26 14:18:42 +0200
committerGitHub <noreply@github.com>2017-04-26 14:18:42 +0200
commite8ddee284cbc82782aef0fc51a2079bf3f6a7327 (patch)
treecd824533b7be281f4221ee913b794fa963f1d207 /include/conversation.php
parentabd7cfdc97e768e28f5d6bf5a21d7f1e3be797e0 (diff)
parent8ad2b3e7a13fccab2e508ce944e0b02c3d259711 (diff)
downloadvolse-hubzilla-e8ddee284cbc82782aef0fc51a2079bf3f6a7327.tar.gz
volse-hubzilla-e8ddee284cbc82782aef0fc51a2079bf3f6a7327.tar.bz2
volse-hubzilla-e8ddee284cbc82782aef0fc51a2079bf3f6a7327.zip
Merge pull request #731 from anaqreon/dev
When template "none" is used in a webpage layout, then the contents o…
Diffstat (limited to 'include/conversation.php')
-rw-r--r--include/conversation.php9
1 files changed, 9 insertions, 0 deletions
diff --git a/include/conversation.php b/include/conversation.php
index 5b2d60583..0f940b1a3 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -1541,6 +1541,15 @@ function prepare_page($item) {
// the template will get passed an unobscured title.
$body = prepare_body($item, true);
+ if(App::$page['template'] == 'none') {
+ $tpl = 'page_display_empty.tpl';
+
+ return replace_macros(get_markup_template($tpl), array(
+ '$body' => $body['html']
+ ));
+
+ }
+
$tpl = get_pconfig($item['uid'], 'system', 'pagetemplate');
if (! $tpl)
$tpl = 'page_display.tpl';