From fe1c0a58c05b0f1604112cf0fbbebd23acfb3847 Mon Sep 17 00:00:00 2001 From: Dylan Date: Mon, 26 Mar 2018 23:23:19 +1300 Subject: [PATCH] FIX be consistent with the variable setting So as to avoid fatal errors while attempting to count. --- src/Extensions/SiteTreeSubsites.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Extensions/SiteTreeSubsites.php b/src/Extensions/SiteTreeSubsites.php index 1a2533e..e36bea5 100644 --- a/src/Extensions/SiteTreeSubsites.php +++ b/src/Extensions/SiteTreeSubsites.php @@ -15,9 +15,11 @@ use SilverStripe\Forms\FieldList; 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; @@ -106,10 +108,11 @@ class SiteTreeSubsites extends DataExtension 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)