X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Fdisplay.php;h=afa61ef026022256304d3e846b2bb9f7b25ea594;hb=2b7d08508d63ad5fd7fa7d4f70e3ce67ba932404;hp=81ed174acc46daac65f51a62327382fce2763800;hpb=96da328acf838faff3fe823f3dd7557d16fe1d8b;p=friendica.git

diff --git a/mod/display.php b/mod/display.php
old mode 100755
new mode 100644
index 81ed174acc..afa61ef026
--- a/mod/display.php
+++ b/mod/display.php
@@ -16,15 +16,7 @@ function display_content(&$a) {
 
 	$o = '<div id="live-display"></div>' . "\r\n";
 
-	$a->page['htmlhead'] .= <<<EOT
-<script>
-$(document).ready(function() {
-	$(".comment-edit-wrapper textarea").contact_autocomplete(baseurl+"/acl");
-	// make auto-complete work in more places
-	$(".wall-item-comment-wrapper textarea").contact_autocomplete(baseurl+"/acl");
-});
-</script>
-EOT;
+	$a->page['htmlhead'] .= get_markup_template('display-head.tpl');
 
 
 	$nick = (($a->argc > 1) ? $a->argv[1] : '');
@@ -121,12 +113,13 @@ EOT;
 			);
 		}
 
-
-		$o .= conversation($a,$r,'display', false);
+		$items = conv_sort($r,"`commented`");
+		
+		$o .= conversation($a,$items,'display', false);
 
 	}
 	else {
-		$r = q("SELECT `id` FROM `item` WHERE `id` = '%s' OR `uri` = '%s' LIMIT 1",
+		$r = q("SELECT `id`,`deleted` FROM `item` WHERE `id` = '%s' OR `uri` = '%s' LIMIT 1",
 			dbesc($item_id),
 			dbesc($item_id)
 		);