aboutsummaryrefslogtreecommitdiffstats
path: root/include/conversation.php
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2017-04-26 14:20:16 +0200
committerMario Vavti <mario@mariovavti.com>2017-04-26 14:20:16 +0200
commitd1c84ad9f0884bb49c7840ac59f5756b16cb7aef (patch)
tree159d3ea820598e16712519ffc6274615b778108b /include/conversation.php
parentc904bd3a628e4bf3c2420ee314277da69828c3b2 (diff)
parentc39a6800968f7ac017d215306b55d5b6bb39ded6 (diff)
downloadvolse-hubzilla-d1c84ad9f0884bb49c7840ac59f5756b16cb7aef.tar.gz
volse-hubzilla-d1c84ad9f0884bb49c7840ac59f5756b16cb7aef.tar.bz2
volse-hubzilla-d1c84ad9f0884bb49c7840ac59f5756b16cb7aef.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
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';