Nemcio/Grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2026-07-13 16:42:47 +02:00
Code Issues Packages Projects Releases Activity

Fix dateRange when startDate is not provided (value of 0)

Browse Source
This commit is contained in:
Thibaut HENIN
2021-05-07 07:33:53 +02:00
committed by Matias Griese
parent a761df80db
commit 9b4f0ca951
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
system/src/Grav/Common/Flex/Types/Pages/PageCollection.php
View File

@@ -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;
}
}

4
system/src/Grav/Common/Page/Collection.php
View File

@@ -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;
}
}