X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Fdisplay.php;h=64df4cc6a9d7fc36a952a107f2845ccfaa21bf7c;hb=34081010ff2eeab2863bfe409f7fd75ecb9e2b20;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..64df4cc6a9
--- a/mod/display.php
+++ b/mod/display.php
@@ -16,15 +16,7 @@ function display_content(&$a) {
$o = '
' . "\r\n";
- $a->page['htmlhead'] .= <<
-$(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");
-});
-
-EOT;
+ $a->page['htmlhead'] .= get_markup_template('display-head.tpl');
$nick = (($a->argc > 1) ? $a->argv[1] : '');
@@ -43,8 +35,18 @@ EOT;
$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),
@@ -121,12 +123,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)
);