mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 14:05:37 +02:00
MINOR Removed Group_Unsecure which was never used
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@64369 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
parent
344d6e173c
commit
050321cb3c
@ -1794,8 +1794,6 @@ class DataObject extends ViewableData implements DataObjectInterface {
|
||||
if(!isset($permissionCache[$memberID][$perm])) {
|
||||
if($member->ID) {
|
||||
$groups = $member->Groups();
|
||||
} else {
|
||||
$groups = DataObject::get("Group_Unsecure", "");
|
||||
}
|
||||
|
||||
$groupList = implode(', ', $groups->column("ID"));
|
||||
|
@ -298,11 +298,4 @@ class Group extends DataObject {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* A group representing everyone, including users not logged in.
|
||||
* @package sapphire
|
||||
* @subpackage security
|
||||
*/
|
||||
class Group_Unsecure extends Group {
|
||||
}
|
||||
?>
|
@ -635,18 +635,13 @@ class Member extends DataObject {
|
||||
*/
|
||||
public function Groups() {
|
||||
$groups = $this->getManyManyComponents("Groups");
|
||||
|
||||
$unsecure = DataObject::get("Group_Unsecure");
|
||||
if($unsecure) {
|
||||
foreach($unsecure as $unsecureItem) {
|
||||
$groups->push($unsecureItem);
|
||||
}
|
||||
}
|
||||
|
||||
$groupIDs = $groups->column();
|
||||
$collatedGroups = array();
|
||||
foreach($groups as $group) {
|
||||
$collatedGroups = array_merge((array)$collatedGroups, $group->collateAncestorIDs());
|
||||
|
||||
if($groups) {
|
||||
foreach($groups as $group) {
|
||||
$collatedGroups = array_merge((array)$collatedGroups, $group->collateAncestorIDs());
|
||||
}
|
||||
}
|
||||
|
||||
$table = "Group_Members";
|
||||
@ -666,8 +661,7 @@ class Member extends DataObject {
|
||||
$result = new Member_GroupSet();
|
||||
}
|
||||
|
||||
$result->setComponentInfo("many-to-many", $this, "Member", $table,
|
||||
"Group");
|
||||
$result->setComponentInfo("many-to-many", $this, "Member", $table, "Group");
|
||||
|
||||
return $result;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user