Merge pull request #2066 from creative-commoners/pulls/4.0/update-subsites-namespace

FIX Implement correct subsites namespace in File extension
This commit is contained in:
Damian Mooyman 2018-01-08 18:23:14 +13:00 committed by GitHub
commit eb46974ad4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -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);
}