Merge pull request #607 from fermionic/20130204-attach-types-are-too-coarse

[friendica.git] / mod / display.php

diff --git a/mod/display.php b/mod/display.php
index 6305dd44e7f02d3f38b510dab91b88cf701e7610..2c9243a217b48211cbcbf00c015b2406bf2d0a3d 100644 (file)
--- a/mod/display.php
+++ b/mod/display.php
@@ -1,6 +1,18 @@
 <?php
 
 
+function display_init(&$a) {
+
+       if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
+               return;
+       }
+
+       $nick = (($a->argc > 1) ? $a->argv[1] : '');
+       profile_load($a,$nick);
+
+}
+
+
 function display_content(&$a, $update = 0) {
 
        if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
@@ -16,7 +28,7 @@ function display_content(&$a, $update = 0) {
 
        $o = '';
 
-       $a->page['htmlhead'] .= get_markup_template('display-head.tpl');
+       $a->page['htmlhead'] .= replace_macros(get_markup_template('display-head.tpl'), array());
 
 
        if($update) {
@@ -25,10 +37,10 @@ function display_content(&$a, $update = 0) {
        else {
                $nick = (($a->argc > 1) ? $a->argv[1] : '');
        }
-       profile_load($a,$nick);
 
        if($update) {
                $item_id = $_REQUEST['item_id'];
+               $a->profile = array('uid' => intval($update), 'profile_uid' => intval($update));
        }
        else {
                $item_id = (($a->argc > 2) ? intval($a->argv[2]) : 0);
@@ -100,14 +112,17 @@ function display_content(&$a, $update = 0) {
                        'acl' => populate_acl($a->user, $celeb),
                        'bang' => '',
                        'visitor' => 'block',
-                       'profile_uid' => local_user()
-               );      
+                       'profile_uid' => local_user(),
+                       'acl_data' => construct_acl_data($a, $a->user), // For non-Javascript ACL selector
+               );
                $o .= status_editor($a,$x,0,true);
        }
 
        $sql_extra = item_permissions_sql($a->profile['uid'],$remote_contact,$groups);
 
        if($update) {
+
+dbg(1);
                $r = q("SELECT id FROM item WHERE item.uid = %d
                        AND `item`.`parent` = ( SELECT `parent` FROM `item` WHERE ( `id` = '%s' OR `uri` = '%s' ))
                        $sql_extra AND unseen = 1",
@@ -115,6 +130,7 @@ function display_content(&$a, $update = 0) {
                        dbesc($item_id),
                        dbesc($item_id) 
                );
+dbg(0);
                if(!$r)
                        return '';
        }