Merge branch '4.3' into 4

2019-01-29 14:03:59 +02:00 · 2019-01-29 14:03:59 +02:00 · 2533e729fc
parent bb659019cf 287f17b848
commit 2533e729fc
1 changed files with 5 additions and 6 deletions
--- 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"'
+            );
    }
 }