mirror of
https://github.com/silverstripe/silverstripe-reports
synced 2024-10-22 11:05:53 +02:00
BUGFIX: if SecurityAdmin::add_hidden_permission() is called more than once, the later one is never added due two array operator "+"
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@94100 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
parent
a8fdcbd967
commit
6ce7428bdc
@ -294,7 +294,7 @@ class SecurityAdmin extends LeftAndMain implements PermissionProvider {
|
|||||||
*/
|
*/
|
||||||
static function add_hidden_permission($codes){
|
static function add_hidden_permission($codes){
|
||||||
if(is_string($codes)) $codes = array($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