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 345b8e9f1e9e6c6b5757b55c9dad31185da75744..2c9243a217b48211cbcbf00c015b2406bf2d0a3d 100644 (file)
--- a/mod/display.php
+++ b/mod/display.php
@@ -4,8 +4,6 @@
 function display_init(&$a) {
 
        if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
-               notice( t('Public access denied.') . EOL);
-               killme();
                return;
        }
 
@@ -17,6 +15,11 @@ function display_init(&$a) {
 
 function display_content(&$a, $update = 0) {
 
+       if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
+               notice( t('Public access denied.') . EOL);
+               return;
+       }
+
        require_once("include/bbcode.php");
        require_once('include/security.php');
        require_once('include/conversation.php');
@@ -109,8 +112,9 @@ 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);
        }