[6.x] Fix calculation of current state

Author: christophstockinger

src/Entries/Entry.php

@@ -791,11 +791,11 @@ public function status()
             return 'published';
         }
 
-        if ($collection->futureDateBehavior() === 'private' && $this->date()->isFuture()) {
+        if (($collection->futureDateBehavior() === 'private' || $collection->futureDateBehavior() === 'unlisted') && $this->date()->isFuture()) {
             return 'scheduled';
         }
 
-        if ($collection->pastDateBehavior() === 'private' && $this->date()->isPast()) {
+        if (($collection->pastDateBehavior() === 'private' || $collection->pastDateBehavior() === 'unlisted') && $this->date()->isPast()) {
             return 'expired';
         }
 

src/Stache/Query/QueriesEntryStatus.php

@@ -45,7 +45,7 @@ private function addCollectionStatusLogicToQuery($query, $status, $collection):
             return;
         }
 
-        if ($collection->futureDateBehavior() === 'private') {
+        if ($collection->futureDateBehavior() === 'private' || $collection->futureDateBehavior() === 'unlisted') {
             $status === 'scheduled'
                 ? $query->where('date', '>', now())
                 : $query->where('date', '<', now());
@@ -55,7 +55,7 @@ private function addCollectionStatusLogicToQuery($query, $status, $collection):
             }
         }
 
-        if ($collection->pastDateBehavior() === 'private') {
+        if ($collection->pastDateBehavior() === 'private' || $collection->pastDateBehavior() === 'unlisted') {
             $status === 'expired'
                 ? $query->where('date', '<', now())
                 : $query->where('date', '>', now());