projects
/
friendica.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
25194b5
)
Ensure the existence of expected default permission keys in ACL::getFullSelectorHTML
author
Hypolite Petovan
<hypolite@mrpetovan.com>
Fri, 29 Nov 2019 16:39:49 +0000
(11:39 -0500)
committer
Hypolite Petovan
<hypolite@mrpetovan.com>
Fri, 29 Nov 2019 16:39:49 +0000
(11:39 -0500)
- Addresses https://sozialwolke.net/display/
703b8751
-145d-e11f-a923-
98e999239905
src/Core/ACL.php
patch
|
blob
|
history
diff --git
a/src/Core/ACL.php
b/src/Core/ACL.php
index 880a1e47ff4f6df6de22747b5513a4b21140f41b..0eb2ecc8b3e1123e584f936bf41e90b67b44d615 100644
(file)
--- a/
src/Core/ACL.php
+++ b/
src/Core/ACL.php
@@
-333,6
+333,13
@@
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'] ?? [],
+ ];
}
if (count($default_permissions['allow_cid'])