From 0de6dbc848cd7188611b52a09890b23800346337 Mon Sep 17 00:00:00 2001 From: Sam Minnee Date: Wed, 30 Mar 2011 17:31:24 +1300 Subject: [PATCH] BUGFIX: Fixed Permission::add_to_hidden_permissions() and Permission::remove_from_hidden_permissions() --- security/PermissionCheckboxSetField.php | 1 + tests/security/PermissionTest.php | 1 + 2 files changed, 2 insertions(+) diff --git a/security/PermissionCheckboxSetField.php b/security/PermissionCheckboxSetField.php index 1e93eb1e4..cac263e03 100644 --- a/security/PermissionCheckboxSetField.php +++ b/security/PermissionCheckboxSetField.php @@ -173,6 +173,7 @@ class PermissionCheckboxSetField extends FormField { $options .= "
  • $categoryName
    • "; foreach($permissions as $code => $permission) { if(in_array($code, $this->hiddenPermissions)) continue; + if(in_array($code, Permission::$hidden_permissions)) continue; $value = $permission['name']; diff --git a/tests/security/PermissionTest.php b/tests/security/PermissionTest.php index 85455b33f..03cb09340 100644 --- a/tests/security/PermissionTest.php +++ b/tests/security/PermissionTest.php @@ -78,5 +78,6 @@ class PermissionTest extends SapphireTest { Permission::remove_from_hidden_permissions('CMS_ACCESS_AssetAdmin'); $this->assertContains('CMS_ACCESS_AssetAdmin', $permissionCheckboxSet->Field()); + Permission::remove_from_hidden_permissions('CMS_ACCESS_CMSMain'); } } \ No newline at end of file