From 6ce7428bdc61459a419dc9285c660f4409bdff24 Mon Sep 17 00:00:00 2001 From: Normann Lou Date: Tue, 1 Dec 2009 02:57:52 +0000 Subject: [PATCH] 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 --- code/SecurityAdmin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/SecurityAdmin.php b/code/SecurityAdmin.php index c8c0ca0a..743f8fd1 100644 --- a/code/SecurityAdmin.php +++ b/code/SecurityAdmin.php @@ -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); } /**