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

[friendica.git] / mod / display.php

diff --git a/mod/display.php b/mod/display.php
index 345b8e9f1e9e6c6b5757b55c9dad31185da75744..2ac1c369ebc33cc2852a25b6573d7fbe236e4ed4 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');