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:
Normann Lou 2009-12-01 02:57:52 +00:00 committed by Sam Minnee
parent a8fdcbd967
commit 6ce7428bdc

View File

@ -294,7 +294,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);
}
/**