From 9ced23473f2f102de5b6d828d093be1102f8d570 Mon Sep 17 00:00:00 2001 From: Damian Mooyman Date: Fri, 18 Jan 2019 09:27:55 +1300 Subject: [PATCH] BUG Don't convert datalist to arraylist when filtering pages Fixes #2354 --- code/Controllers/CMSSiteTreeFilter_PublishedPages.php | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/code/Controllers/CMSSiteTreeFilter_PublishedPages.php b/code/Controllers/CMSSiteTreeFilter_PublishedPages.php index 2e23f8ce..1c6ed1f2 100644 --- a/code/Controllers/CMSSiteTreeFilter_PublishedPages.php +++ b/code/Controllers/CMSSiteTreeFilter_PublishedPages.php @@ -41,11 +41,10 @@ class CMSSiteTreeFilter_PublishedPages extends CMSSiteTreeFilter */ public function getFilteredPages() { - $pages = Versioned::get_including_deleted(SiteTree::class); - $pages = $this->applyDefaultFilters($pages); - $pages = $pages->filterByCallback(function (SiteTree $page) { - return $page->isPublished(); - }); - return $pages; + return Versioned::get_including_deleted(SiteTree::class) + ->innerJoin( + 'SiteTree_Live', + '"SiteTree_Versions"."RecordID" = "SiteTree_Live"."ID"' + ); } }