summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg Roach <fisharebest@webtrees.net>2019-03-02 12:13:40 +0000
committerGreg Roach <fisharebest@webtrees.net>2019-03-02 14:30:29 +0000
commit6a5d238b3a0931ab1cdc7d4ad56663e8eb272236 (patch)
tree3961db3b939e84a611510db9e35c7b996a3d3ea3
parent436c1c02528240d8268352b4c8f7ed8439f01d49 (diff)
downloadwebtrees-6a5d238b3a0931ab1cdc7d4ad56663e8eb272236.tar.gz
webtrees-6a5d238b3a0931ab1cdc7d4ad56663e8eb272236.tar.bz2
webtrees-6a5d238b3a0931ab1cdc7d4ad56663e8eb272236.zip
Use carbon functions instead of magic numbers
-rw-r--r--app/Http/Controllers/CalendarController.php2
-rw-r--r--app/Module/ResearchTaskModule.php3
2 files changed, 3 insertions, 2 deletions
diff --git a/app/Http/Controllers/CalendarController.php b/app/Http/Controllers/CalendarController.php
index 2cb54343f5..f3ca09dfe9 100644
--- a/app/Http/Controllers/CalendarController.php
+++ b/app/Http/Controllers/CalendarController.php
@@ -482,7 +482,7 @@ class CalendarController extends AbstractBaseController
private function applyFilter(array $facts, string $filterof, string $filtersx): array
{
$filtered = [];
- $hundred_years = unixtojd(Carbon::now()->timestamp) - 36525;
+ $hundred_years = unixtojd(Carbon::now()->subYears(100)->timestamp);
foreach ($facts as $fact) {
$record = $fact->record();
if ($filtersx) {
diff --git a/app/Module/ResearchTaskModule.php b/app/Module/ResearchTaskModule.php
index 024224f8ed..5fbdc28be7 100644
--- a/app/Module/ResearchTaskModule.php
+++ b/app/Module/ResearchTaskModule.php
@@ -80,7 +80,8 @@ class ResearchTaskModule extends AbstractModule implements ModuleBlockInterface
extract($cfg, EXTR_OVERWRITE);
- $end_jd = $show_future ? 99999999 : unixtojd(Carbon::now()->timestamp);
+ $end_date = $show_future ? Carbon::maxValue() : Carbon::now();
+ $end_jd = unixtojd($end_date->timestamp);
$individuals = $this->individualsWithTasks($tree, $end_jd);
$families = $this->familiesWithTasks($tree, $end_jd);