From 9d35048fb9804778996d8df3eafb08746506a5db Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 6 Sep 2020 07:27:36 +0200 Subject: [PATCH] Fix #3770 --- app/Http/Controllers/TagController.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/TagController.php b/app/Http/Controllers/TagController.php index 44f15041fc..4637d7e20f 100644 --- a/app/Http/Controllers/TagController.php +++ b/app/Http/Controllers/TagController.php @@ -180,8 +180,9 @@ class TagController extends Controller public function index(TagRepositoryInterface $repository) { // start with oldest tag - $oldestTagDate = null === $repository->oldestTag() ? clone session('first') : $repository->oldestTag()->date; - $newestTagDate = null === $repository->newestTag() ? new Carbon : $repository->newestTag()->date; + $first = session('first', today()) ?? today(); + $oldestTagDate = null === $repository->oldestTag() ? clone $first : $repository->oldestTag()->date; + $newestTagDate = null === $repository->newestTag() ? today() : $repository->newestTag()->date; $oldestTagDate->startOfYear(); $newestTagDate->endOfYear(); $tags = [];