diff options
| -rw-r--r-- | images/emoji/README | 2 | ||||
| -rw-r--r-- | include/conversation.php | 9 | ||||
| -rw-r--r-- | view/tpl/page_display_empty.tpl | 1 |
3 files changed, 12 insertions, 0 deletions
diff --git a/images/emoji/README b/images/emoji/README new file mode 100644 index 000000000..ab478b753 --- /dev/null +++ b/images/emoji/README @@ -0,0 +1,2 @@ +These files supplied by emojione. License is CC BY 4.0. Attribution is required for commercial use. +See http://emojione.com 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'; diff --git a/view/tpl/page_display_empty.tpl b/view/tpl/page_display_empty.tpl new file mode 100644 index 000000000..9f000dee8 --- /dev/null +++ b/view/tpl/page_display_empty.tpl @@ -0,0 +1 @@ +{{$body}}
\ No newline at end of file |