Some more places ...

[friendica.git] / mod / friendica.php

diff --git a/mod/friendica.php b/mod/friendica.php
index 6c143634caf980ae9cc430e46dfc8c53f0b380ca..e75e9cebaeda19828c79a9df552eaa656d8e5336 100644 (file)
--- a/mod/friendica.php
+++ b/mod/friendica.php
@@ -11,7 +11,7 @@ use Friendica\Database\DBM;
 
 function friendica_init(App $a)
 {
-       if ($a->argv[1] == "json") {
+       if (!empty($a->argv[1]) && ($a->argv[1] == "json")) {
                $register_policy = ['REGISTER_CLOSED', 'REGISTER_APPROVE', 'REGISTER_OPEN'];
 
                $sql_extra = '';
@@ -116,14 +116,14 @@ function friendica_content(App $a)
        } else {
                $o .= '<p>' . L10n::t('No installed addons/apps') . '</p>' . PHP_EOL;
        }
-       
+
        if (Config::get('system', 'tosdisplay'))
        {
                $o .= '<p>'.L10n::t('Read about the <a href="%1$s/tos">Terms of Service</a> of this node.', System::baseurl()).'</p>';
        }
 
-       $blocklist = Config::get('system', 'blocklist');
-       if (count($blocklist)) {
+       $blocklist = Config::get('system', 'blocklist', []);
+       if (!empty($blocklist)) {
                $o .= '<div id="about_blocklist"><p>' . L10n::t('On this server the following remote servers are blocked.') . '</p>' . PHP_EOL;
                $o .= '<table class="table"><thead><tr><th>' . L10n::t('Blocked domain') . '</th><th>' . L10n::t('Reason for the block') . '</th></thead><tbody>' . PHP_EOL;
                foreach ($blocklist as $b) {