Merge pull request #731 from anaqreon/dev

When template "none" is used in a webpage layout, then the contents o…

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';

view/tpl/page_display_empty.tpl

@@ -0,0 +1 @@
+{{$body}}