From 157aef8eb7c4455703c143463a3e8ccf5480fc89 Mon Sep 17 00:00:00 2001 From: Robbie Averill Date: Mon, 8 Jan 2018 15:40:48 +1300 Subject: [PATCH] FIX Implement correct subsites namespace in File extension --- code/Model/SiteTreeFileExtension.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/code/Model/SiteTreeFileExtension.php b/code/Model/SiteTreeFileExtension.php index 9e208992..435cb68f 100644 --- a/code/Model/SiteTreeFileExtension.php +++ b/code/Model/SiteTreeFileExtension.php @@ -7,9 +7,9 @@ use SilverStripe\Forms\FieldList; use SilverStripe\Forms\ReadonlyField; use SilverStripe\ORM\DataExtension; use SilverStripe\ORM\ManyManyList; +use SilverStripe\Subsites\Model\Subsite; use SilverStripe\Versioned\Versioned; use SilverStripe\View\SSViewer; -use Subsite; /** * Extension applied to {@see File} object to track links to {@see SiteTree} records. @@ -74,7 +74,8 @@ class SiteTreeFileExtension extends DataExtension */ public function BackLinkTracking() { - if (class_exists("Subsite")) { + // @todo remove coupling with Subsites + if (class_exists(Subsite::class)) { $rememberSubsiteFilter = Subsite::$disable_subsite_filter; Subsite::disable_subsite_filter(true); } @@ -82,7 +83,7 @@ class SiteTreeFileExtension extends DataExtension $links = $this->owner->getManyManyComponents('BackLinkTracking'); $this->owner->extend('updateBackLinkTracking', $links); - if (class_exists("Subsite")) { + if (class_exists(Subsite::class)) { Subsite::disable_subsite_filter($rememberSubsiteFilter); }