Remove orderable collection requirement

statamic · Oct 5, 2023 · c6de64d · c6de64d
1 parent 72527a3
commit c6de64d
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/src/Tags/Collection/Entries.php b/src/Tags/Collection/Entries.php
@@ -73,8 +73,9 @@ public function next($currentEntry)
             $operator = '<';
         }
 
-        if ($collection->orderable() && $primaryOrderBy->sort === 'order') {
-            $query = $this->query()->where('order', $operator ?? '>', $currentEntry->order());
+        if ($primaryOrderBy->sort === 'order') {
+            throw_if(! $currentOrder = $currentEntry->order(), new \Exception('Current entry does not have an order'));
+            $query = $this->query()->where('order', $operator ?? '>', $currentOrder);
         } elseif ($collection->dated() && $primaryOrderBy->sort === 'date') {
             $query = $this->query()->where('date', $operator ?? '>', $currentEntry->date());
         } else {
@@ -97,8 +98,9 @@ public function previous($currentEntry)
             $operator = '>';
         }
 
-        if ($collection->orderable() && $primaryOrderBy->sort === 'order') {
-            $query = $this->query()->where('order', $operator ?? '<', $currentEntry->order());
+        if ($primaryOrderBy->sort === 'order') {
+            throw_if(! $currentOrder = $currentEntry->order(), new \Exception('Current entry does not have an order'));
+            $query = $this->query()->where('order', $operator ?? '<', $currentOrder);
         } elseif ($collection->dated() && $primaryOrderBy->sort === 'date') {
             $query = $this->query()->where('date', $operator ?? '<', $currentEntry->date());
         } else {