From b3bc53738b86021cf46774717e70efe3b140a041 Mon Sep 17 00:00:00 2001 From: Sean Harvey Date: Wed, 16 Dec 2009 05:54:23 +0000 Subject: [PATCH] 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 --- code/SecurityAdmin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/SecurityAdmin.php b/code/SecurityAdmin.php index 41a37e8c..527fce99 100644 --- a/code/SecurityAdmin.php +++ b/code/SecurityAdmin.php @@ -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); } /**