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 81ed174..afa61ef
--- 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)
                );