X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdisplay.php;h=64df4cc6a9d7fc36a952a107f2845ccfaa21bf7c;hb=34081010ff2eeab2863bfe409f7fd75ecb9e2b20;hp=f510f793df9d98b2e05356ab6c0b387da0b5a515;hpb=1224e256b1aba0b52bd64f63204b29d0ec86e813;p=friendica.git

diff --git a/mod/display.php b/mod/display.php
old mode 100755
new mode 100644
index f510f793df..64df4cc6a9
--- a/mod/display.php
+++ b/mod/display.php
@@ -16,7 +16,7 @@ function display_content(&$a) {
 
 	$o = '<div id="live-display"></div>' . "\r\n";
 
-	$a->page['htmlhead'] .= '<script>$(document).ready(function() {	$(".comment-edit-wrapper  textarea").contact_autocomplete(baseurl+"/acl"); });</script>';
+	$a->page['htmlhead'] .= get_markup_template('display-head.tpl');
 
 
 	$nick = (($a->argc > 1) ? $a->argv[1] : '');
@@ -35,8 +35,18 @@ function display_content(&$a) {
 	$contact = null;
 	$remote_contact = false;
 
-	if(remote_user()) {
-		$contact_id = $_SESSION['visitor_id'];
+	$contact_id = 0;
+
+	if(is_array($_SESSION['remote'])) {
+		foreach($_SESSION['remote'] as $v) {
+			if($v['uid'] == $a->profile['uid']) {
+				$contact_id = $v['cid'];
+				break;
+			}
+		}
+	}
+
+	if($contact_id) {
 		$groups = init_groups_visitor($contact_id);
 		$r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
 			intval($contact_id),
@@ -85,7 +95,7 @@ function display_content(&$a) {
 		$o .= status_editor($a,$x,0,true);
 
 
-	$sql_extra = permissions_sql($a->profile['uid'],$remote_contact,$groups);
+	$sql_extra = item_permissions_sql($a->profile['uid'],$remote_contact,$groups);
 
 	$r = q("SELECT `item`.*, `item`.`id` AS `item_id`, 
 		`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
@@ -113,12 +123,13 @@ function display_content(&$a) {
 			);
 		}
 
-
-		$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)
 		);