mirror of
https://github.com/silverstripe/silverstripe-cms
synced 2024-10-22 08:05:56 +02:00
BUGFIX: if SecurityAdmin::add_hidden_permission() is called more than once, the later one is never added due two array operator "+" (from r94100)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@95643 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
parent
c2403fc8c9
commit
b3bc53738b
@ -230,7 +230,7 @@ class SecurityAdmin extends LeftAndMain implements PermissionProvider {
|
||||
*/
|
||||
static function add_hidden_permission($codes){
|
||||
if(is_string($codes)) $codes = array($codes);
|
||||
self::$hidden_permissions += $codes;
|
||||
self::$hidden_permissions = array_merge(self::$hidden_permissions, $codes);
|
||||
}
|
||||
|
||||
/**
|
||||
|
Loading…
Reference in New Issue
Block a user