Merge branch '4.1' into 4

silverstripe · Sep 30, 2023 · 685ccf3 · 685ccf3
2 parents f4ae122 + fe638a0
commit 685ccf3
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/Model/BlogPostFilter.php b/src/Model/BlogPostFilter.php
@@ -28,13 +28,17 @@ class BlogPostFilter extends DataExtension
      */
     public function augmentSQL(SQLSelect $query, DataQuery $dataQuery = null)
     {
-        $stage = Versioned::get_stage();
 
         if (Controller::has_curr() && Controller::curr() instanceof LeftAndMain) {
             return;
         }
 
-        if ($stage == 'Live' || !Permission::check('VIEW_DRAFT_CONTENT')) {
+        if (Versioned::get_stage() === Versioned::LIVE ||
+            (
+                Versioned::get_draft_site_secured() &&
+                !Permission::check('VIEW_DRAFT_CONTENT')
+            )
+        ) {
             $query->addWhere(sprintf(
                 '"PublishDate" < \'%s\'',
                 Convert::raw2sql(DBDatetime::now())