Optimize PR #902 (#908)

getgrav · Jun 16, 2016 · f845943 · f845943
1 parent f8964ab
commit f845943
Showing 1 changed file with 7 additions and 21 deletions.
diff --git a/system/src/Grav/Common/Page/Collection.php b/system/src/Grav/Common/Page/Collection.php
@@ -273,32 +273,18 @@ public function dateRange($startDate, $endDate = false, $field = false)
         $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;
-                    }
-                }
-            }
-        } 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;
-                    }
+                if ($date >= $start && (!$end || $date <= $end)) {
+                    $date_range[$path] = $slug;
                 }
             }
         }
+
         $this->items = $date_range;
-
         return $this;
     }