X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FACL.php;h=ffe11363f573f0006043a7716f899386ef4045f2;hb=505350c9fb9b16dde6c86d418947592ab3720282;hp=20db2908772b2ec4be0cfa095033677d3f4bc954;hpb=b6cb83ed4c670c3ea9dde080cb7d9a3bb292d6b2;p=friendica.git diff --git a/src/Core/ACL.php b/src/Core/ACL.php index 20db290877..ffe11363f5 100644 --- a/src/Core/ACL.php +++ b/src/Core/ACL.php @@ -17,7 +17,7 @@ use Friendica\Util\Network; /** * Handle ACL management and display * - * @author Hypolite Petovan + * @author Hypolite Petovan */ class ACL extends BaseObject { @@ -296,10 +296,10 @@ class ACL extends BaseObject '$showall' => L10n::t('Visible to everybody'), '$show' => L10n::t('show'), '$hide' => L10n::t('don\'t show'), - '$allowcid' => json_encode($default_permissions['allow_cid']), - '$allowgid' => json_encode($default_permissions['allow_gid']), - '$denycid' => json_encode($default_permissions['deny_cid']), - '$denygid' => json_encode($default_permissions['deny_gid']), + '$allowcid' => json_encode(defaults($default_permissions, 'allow_cid', '')), + '$allowgid' => json_encode(defaults($default_permissions, 'allow_gid', '')), + '$denycid' => json_encode(defaults($default_permissions, 'deny_cid', '')), + '$denygid' => json_encode(defaults($default_permissions, 'deny_gid', '')), '$networks' => $show_jotnets, '$emailcc' => L10n::t('CC: email addresses'), '$emtitle' => L10n::t('Example: bob@example.com, mary@example.com'), @@ -324,7 +324,7 @@ class ACL extends BaseObject */ public static function contactAutocomplete($search, $mode) { - if ((Config::get('system', 'block_public')) && (!local_user()) && (!remote_user())) { + if (Config::get('system', 'block_public') && !local_user() && !remote_user()) { return []; }