Merge branch 'dev' into auto-save

2018-04-07 17:48:48 -04:00
parent a5aff7d0c9 bddf8cfde4
commit be6dcb5d0a
37 changed files with 928 additions and 87 deletions
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -1615,7 +1615,7 @@ function prepare_page($item) {
 	// prepare_body calls unobscure() as a side effect. Do it here so that
 	// the template will get passed an unobscured title.

-	$body = prepare_body($item, true);
+	$body = prepare_body($item, [ 'newwin' => false ]);
 	if(App::$page['template'] == 'none') {
 		$tpl = 'page_display_empty.tpl';