Merge pull request #7901 from annando/disable-smart-threading

[friendica.git] / src / Core / ACL.php

diff --git a/src/Core/ACL.php b/src/Core/ACL.php
index 0eb2ecc8b3e1123e584f936bf41e90b67b44d615..e6dd1a8f32400879a3c03000914334d281c34de5 100644 (file)
--- a/src/Core/ACL.php
+++ b/src/Core/ACL.php
@@ -333,15 +333,16 @@ class ACL extends BaseObject
                // Defaults user permissions
                if (empty($default_permissions)) {
                        $default_permissions = self::getDefaultUserPermissions($user);
-               } else {
-                       $default_permissions = [
-                               'allow_cid' => $default_permissions['allow_cid'] ?? [],
-                               'allow_gid' => $default_permissions['allow_gid'] ?? [],
-                               'deny_cid'  => $default_permissions['deny_cid']  ?? [],
-                               'deny_gid'  => $default_permissions['deny_gid']  ?? [],
-                       ];
                }
 
+               $default_permissions = [
+                       'allow_cid' => $default_permissions['allow_cid'] ?? [],
+                       'allow_gid' => $default_permissions['allow_gid'] ?? [],
+                       'deny_cid'  => $default_permissions['deny_cid']  ?? [],
+                       'deny_gid'  => $default_permissions['deny_gid']  ?? [],
+                       'hidewall'  => $default_permissions['hidewall']  ?? false,
+               ];
+
                if (count($default_permissions['allow_cid'])
                        + count($default_permissions['allow_gid'])
                        + count($default_permissions['deny_cid'])
@@ -359,14 +360,14 @@ class ACL extends BaseObject
                        $pubmail_enabled = false;
 
                        if (function_exists('imap_open') && !Config::get('system', 'imap_disabled')) {
-                               $mailacct = DBA::selectFirst('mailacct', ['pubmail'], ['`uid` = ? AND `server` != ""', $user['úid']]);
+                               $mailacct = DBA::selectFirst('mailacct', ['pubmail'], ['`uid` = ? AND `server` != ""', $user['uid']]);
                                if (DBA::isResult($mailacct)) {
                                        $mail_enabled = true;
                                        $pubmail_enabled = !empty($mailacct['pubmail']);
                                }
                        }
 
-                       if (empty($default_permissions['hidewall'])) {
+                       if ($default_permissions['hidewall']) {
                                if ($mail_enabled) {
                                        $jotnets_fields[] = [
                                                'type' => 'checkbox',