diff --git a/code/extensions/SiteTreeSubsites.php b/code/extensions/SiteTreeSubsites.php index 5db49e8..dd80e49 100644 --- a/code/extensions/SiteTreeSubsites.php +++ b/code/extensions/SiteTreeSubsites.php @@ -184,9 +184,9 @@ class SiteTreeSubsites extends DataExtension { */ function ReverseRelated() { return DataObject::get('RelatedPageLink', "\"RelatedPageLink\".\"RelatedPageID\" = {$this->owner->ID} - AND R2.\"ID\" IS NULL", '') + AND \"R2\".\"ID\" IS NULL", '') ->innerJoin('SiteTree', "\"SiteTree\".\"ID\" = \"RelatedPageLink\".\"MasterPageID\"") - ->leftJoin('RelatedPageLink', "R2.\"MasterPageID\" = {$this->owner->ID} AND R2.\"RelatedPageID\" = \"RelatedPageLink\".\"MasterPageID\"", 'R2'); + ->leftJoin('RelatedPageLink', "\"R2\".\"MasterPageID\" = {$this->owner->ID} AND \"R2\".\"RelatedPageID\" = \"RelatedPageLink\".\"MasterPageID\"", 'R2'); } function NormalRelated() { diff --git a/tests/FileSubsitesTest.php b/tests/FileSubsitesTest.php index 9d276e1..1ff5c5a 100644 --- a/tests/FileSubsitesTest.php +++ b/tests/FileSubsitesTest.php @@ -67,7 +67,7 @@ class FileSubsitesTest extends BaseSubsiteTest { 'Test 1', 'Test 2', 'Test 3' - ), $file->getCMSFields()->dataFieldByName('SubsiteID')->getSource()); + ), array_values($file->getCMSFields()->dataFieldByName('SubsiteID')->getSource())); } }