tonyair/silverstripe-subsites
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-subsites synced 2024-10-22 11:05:55 +02:00
Code Issues Projects Releases Wiki Activity

Remove irrelevant check for subsites list size, use func_num_args() and add break to loop

Browse Source
This commit is contained in:
Robbie Averill 2018-08-27 10:04:57 +12:00
parent 6af985420f
commit 7681634cb2
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Extensions/LeftAndMainSubsites.php
View File

@ -88,11 +88,6 @@ class LeftAndMainSubsites extends LeftAndMainExtension
$accessibleSubsites = ArrayList::create(); $accessibleSubsites = ArrayList::create();
$subsites = Subsite::all_sites($includeMainSite, $mainSiteTitle); $subsites = Subsite::all_sites($includeMainSite, $mainSiteTitle);
// Check whether we have any subsites
if (!$subsites->exists()) {
return $accessibleSubsites;
}
foreach ($subsites as $subsite) { foreach ($subsites as $subsite) {
/** @var Subsite $subsite */ /** @var Subsite $subsite */
$canAccess = SubsiteState::singleton() $canAccess = SubsiteState::singleton()
@ -211,7 +206,7 @@ class LeftAndMainSubsites extends LeftAndMainExtension
public function canAccess() public function canAccess()
{ {
// Allow us to accept a Member object passed in as an argument without breaking semver // Allow us to accept a Member object passed in as an argument without breaking semver
$passedMember = func_get_args() ? func_get_arg(0) : null; $passedMember = func_num_args() ? func_get_arg(0) : null;
// Admin can access everything, no point in checking. // Admin can access everything, no point in checking.
$member = $passedMember ?: Security::getCurrentUser(); $member = $passedMember ?: Security::getCurrentUser();
@ -249,6 +244,7 @@ class LeftAndMainSubsites extends LeftAndMainExtension
$groupSubsiteIds = $group->Subsites()->column('ID'); $groupSubsiteIds = $group->Subsites()->column('ID');
if (in_array($currentSubsiteId, $groupSubsiteIds)) { if (in_array($currentSubsiteId, $groupSubsiteIds)) {
$allowedInSubsite = true; $allowedInSubsite = true;
break;
} }
} }