Frost-mobile: media query in css for tablets

[friendica.git] / mod / display.php

diff --git a/mod/display.php b/mod/display.php
old mode 100755 (executable)
new mode 100644 (file)
index d96be43..92ffd1a
--- 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] : '');
@@ -74,18 +74,18 @@ function display_content(&$a) {
                $x = array(
                        'is_owner' => true,
                        'allow_location' => $a->user['allow_location'],
-                       'default_location' => $a->user['default_location'],
+                       'default_location' => $a->user['default-location'],
                        'nickname' => $a->user['nickname'],
-                       'lockstate' => ((($group) || (is_array($a->user) && ((strlen($a->user['allow_cid'])) || (strlen($a->user['allow_gid'])) || (strlen($a->user['deny_cid'])) || (strlen($a->user['deny_gid']))))) ? 'lock' : 'unlock'),
-                       'acl' => populate_acl((($group || $cid) ? $def_acl : $a->user), $celeb),
-                       'bang' => (($group || $cid) ? '!' : ''),
+                       'lockstate' => ( (is_array($a->user)) && ((strlen($a->user['allow_cid'])) || (strlen($a->user['allow_gid'])) || (strlen($a->user['deny_cid'])) || (strlen($a->user['deny_gid']))) ? 'lock' : 'unlock'),
+                       'acl' => populate_acl($a->user, $celeb),
+                       'bang' => '',
                        'visitor' => 'block',
                        'profile_uid' => local_user()
                );      
                $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`,
@@ -118,7 +118,7 @@ function display_content(&$a) {
 
        }
        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)
                );