Skip to content

Commit

Permalink
FIX be consistent with the variable setting
Browse files Browse the repository at this point in the history
So as to avoid fatal errors while attempting to count.
  • Loading branch information
Dylan authored and dhensby committed Mar 27, 2018
1 parent c7425ef commit fe1c0a5
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion src/Extensions/SiteTreeSubsites.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,11 @@
use SilverStripe\Forms\FormAction;
use SilverStripe\Forms\ToggleCompositeField;
use SilverStripe\i18n\i18n;
use SilverStripe\ORM\ArrayList;
use SilverStripe\ORM\DataExtension;
use SilverStripe\ORM\DataObject;
use SilverStripe\ORM\DataQuery;
use SilverStripe\ORM\Map;
use SilverStripe\ORM\Queries\SQLSelect;
use SilverStripe\Security\Member;
use SilverStripe\Security\Security;
Expand Down Expand Up @@ -106,10 +108,11 @@ public function onBeforeWrite()
public function updateCMSFields(FieldList $fields)
{
$subsites = Subsite::accessible_sites('CMS_ACCESS_CMSMain');
$subsitesMap = [];
if ($subsites && $subsites->count()) {
$subsitesToMap = $subsites->exclude('ID', $this->owner->SubsiteID);
$subsitesMap = $subsitesToMap->map('ID', 'Title');
} else {
$subsitesMap = new Map(ArrayList::create());
}

// Master page edit field (only allowed from default subsite to avoid inconsistent relationships)
Expand Down

0 comments on commit fe1c0a5

Please sign in to comment.