From c177a9f640d21629b7e1cb75863a6bd9f9b68743 Mon Sep 17 00:00:00 2001 From: Thomas Portelange Date: Thu, 16 Aug 2018 16:19:25 +0200 Subject: [PATCH] allow disabling filter using queryParam It is much better than relying on global state --- src/Extensions/FileSubsites.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/Extensions/FileSubsites.php b/src/Extensions/FileSubsites.php index 37a9522c..7d55fd72 100644 --- a/src/Extensions/FileSubsites.php +++ b/src/Extensions/FileSubsites.php @@ -52,6 +52,9 @@ public function augmentSQL(SQLSelect $query, DataQuery $dataQuery = null) if (Subsite::$disable_subsite_filter) { return; } + if ($dataQuery && $dataQuery->getQueryParam('Subsite.filter') === false) { + return; + } // If you're querying by ID, ignore the sub-site - this is a bit ugly... (but it was WAYYYYYYYYY worse) // @TODO I don't think excluding if SiteTree_ImageTracking is a good idea however because of the SS 3.0 api and