head.tpl: commentOpen() and commentClose() return true/false

[friendica.git] / mod / display.php

diff --git a/mod/display.php b/mod/display.php
old mode 100755 (executable)
new mode 100644 (file)
index 4f2e5ff..afa61ef
--- 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] : '');
@@ -34,7 +34,7 @@ function display_content(&$a) {
 
        $contact = null;
        $remote_contact = false;
-dbg(1);
+
        if(remote_user()) {
                $contact_id = $_SESSION['visitor_id'];
                $groups = init_groups_visitor($contact_id);
@@ -85,10 +85,7 @@ dbg(1);
                $o .= status_editor($a,$x,0,true);
 
 
-       $sql_extra = permissions_sql($a->profile['uid'],$remote_contact,$groups);
-
-       if(! local_user() && ! remote_user())
-               $sql_extra .= " and `item`.`private` = 0 ";
+       $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`,
@@ -116,12 +113,13 @@ dbg(1);
                        );
                }
 
-
-               $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)
                );
@@ -138,7 +136,7 @@ dbg(1);
                }
 
        }
-dbg(0);
+
        return $o;
 }