diff --git a/system/src/Grav/Common/Flex/Types/Pages/PageCollection.php b/system/src/Grav/Common/Flex/Types/Pages/PageCollection.php index 8ab772ccf..83c15e1be 100644 --- a/system/src/Grav/Common/Flex/Types/Pages/PageCollection.php +++ b/system/src/Grav/Common/Flex/Types/Pages/PageCollection.php @@ -438,7 +438,7 @@ class PageCollection extends FlexPageCollection implements PageCollectionInterfa */ public function dateRange($startDate, $endDate = false, $field = null) { - $start = Utils::date2timestamp($startDate); + $start = $startDate ? Utils::date2timestamp($startDate) : false; $end = $endDate ? Utils::date2timestamp($endDate) : false; $entries = []; @@ -449,7 +449,7 @@ class PageCollection extends FlexPageCollection implements PageCollectionInterfa $date = $field ? strtotime($object->getNestedProperty($field)) : $object->date(); - if ($date >= $start && (!$end || $date <= $end)) { + if ((!$start || $date >= $start) && (!$end || $date <= $end)) { $entries[$key] = $object; } } diff --git a/system/src/Grav/Common/Page/Collection.php b/system/src/Grav/Common/Page/Collection.php index e67ff047b..e9cd629f9 100644 --- a/system/src/Grav/Common/Page/Collection.php +++ b/system/src/Grav/Common/Page/Collection.php @@ -331,7 +331,7 @@ class Collection extends Iterator implements PageCollectionInterface */ public function dateRange($startDate, $endDate = false, $field = null) { - $start = Utils::date2timestamp($startDate); + $start = $startDate ? Utils::date2timestamp($startDate) : false; $end = $endDate ? Utils::date2timestamp($endDate) : false; $date_range = []; @@ -340,7 +340,7 @@ class Collection extends Iterator implements PageCollectionInterface if ($page !== null) { $date = $field ? strtotime($page->value($field)) : $page->date(); - if ($date >= $start && (!$end || $date <= $end)) { + if ((!$start || $date >= $start) && (!$end || $date <= $end)) { $date_range[$path] = $slug; } }