From 05c07fc82474073845d9ddd8cd386f8462f9bf78 Mon Sep 17 00:00:00 2001 From: Tom Rix Date: Mon, 1 Mar 2010 22:07:41 +0000 Subject: [PATCH] BUGFIX: Only show the subsites that you can actually access in the subsite tab of the group. (from r88952) (from r96296) --- code/GroupSubsites.php | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/code/GroupSubsites.php b/code/GroupSubsites.php index 03fb7e5..04e824d 100644 --- a/code/GroupSubsites.php +++ b/code/GroupSubsites.php @@ -54,7 +54,6 @@ class GroupSubsites extends DataObjectDecorator implements PermissionProvider { } } - function updateCMSFields(&$fields) { if($this->owner->canEdit() ){ // i18n tab @@ -208,7 +207,6 @@ class GroupSubsites extends DataObjectDecorator implements PermissionProvider { return $group; } -<<<<<<< .working function providePermissions() { return array( @@ -220,15 +218,6 @@ class GroupSubsites extends DataObjectDecorator implements PermissionProvider { ) ); } -======= - - function providePermissions() { - return array( - 'SECURITY_SUBSITE_GROUP' => 'Edit the subsite a group can access' - ); - } ->>>>>>> .merge-right.r96288 - } ?> \ No newline at end of file