clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix warnings about unexpected parameter array values type in ACL::getFullSelectorHTML

Browse Source 
- Addresses https://github.com/friendica/friendica/issues/7676#issuecomment-560503744
This commit is contained in:
Hypolite Petovan
2019-12-03 06:59:51 -05:00
parent b152d0557b
commit f989c331a3
3 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/Core/ACL.php
View File

@@ -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'])
@@ -366,7 +367,7 @@ class ACL extends BaseObject
}
}
if (empty($default_permissions['hidewall'])) {
if ($default_permissions['hidewall']) {
if ($mail_enabled) {
$jotnets_fields[] = [
'type' => 'checkbox',
@@ -410,7 +411,7 @@ class ACL extends BaseObject
'$group_deny' => implode(',', $default_permissions['deny_gid']),
'$for_federation' => $for_federation,
'$jotnets_fields' => $jotnets_fields,
'$user_hidewall' => $default_permissions['hidewall'] ?? false,
'$user_hidewall' => $default_permissions['hidewall'],
]);
return $o;