Merge https://github.com/friendica/friendica into pull

[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..81ed174
--- a/mod/display.php
+++ b/mod/display.php
@@ -16,7 +16,15 @@ 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'] .= <<<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;
 
 
        $nick = (($a->argc > 1) ? $a->argv[1] : '');
@@ -34,7 +42,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 +93,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`,
@@ -138,7 +143,7 @@ dbg(1);
                }
 
        }
-dbg(0);
+
        return $o;
 }