Nemcio/Grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2026-07-05 23:28:32 +02:00
Code Issues Packages Projects Releases Activity

Remove end date check if not specified (better 32-bit support) (#902)

Browse Source 
* Remove end date check if not specified (better 32-bit support)

Related to https://github.com/getgrav/grav/issues/898

I can't find better way to remove it with DRY principle 😑
With smaller code we need to check a value for each `$this->items` iteration.

Also it can be used with `PHP_INT_MAX` with previous version of this code.

* Include endpoints
This commit is contained in:
Artyom Mezin
2016-06-15 18:19:17 +11:00
committed by Flavio Copes
parent fedf7f0903
commit f8964ab908
1 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -270,17 +270,30 @@ class Collection extends Iterator
public function dateRange($startDate, $endDate = false, $field = false)
{
$start = Utils::date2timestamp($startDate);
$end = $endDate ? Utils::date2timestamp($endDate) : strtotime("now +1000 years");
$end = $endDate ? Utils::date2timestamp($endDate) : false;
$date_range = [];
foreach ($this->items as $path => $slug) {
$page = $this->pages->get($path);
if ($page !== null) {
$date = $field ? strtotime($page->value($field)) : $page->date();
if ($end) {
foreach ($this->items as $path => $slug) {
$page = $this->pages->get($path);
if ($page !== null) {
$date = $field ? strtotime($page->value($field)) : $page->date();
if ($date > $start && $date < $end) {
$date_range[$path] = $slug;
if ($date >= $start && $date <= $end) {
$date_range[$path] = $slug;
}
}
}
} else {
foreach ($this->items as $path => $slug) {
$page = $this->pages->get($path);
if ($page !== null) {
$date = $field ? strtotime($page->value($field)) : $page->date();
if ($date >= $start) {
$date_range[$path] = $slug;
}
}
}
}