From bfe34ff61df650b02610767af673644144f015eb Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Wed, 2 Jan 2019 15:26:04 +0100
Subject: [inc/Util] Improve prettyTime year cutoff logic

Closes #3518
---
 inc/util.inc.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/inc/util.inc.php b/inc/util.inc.php
index 9f6f63db..1a5cbefe 100644
--- a/inc/util.inc.php
+++ b/inc/util.inc.php
@@ -495,7 +495,7 @@ SADFACE;
 		settype($ts, 'int');
 		if ($ts === 0)
 			return '???';
-		static $TODAY = false, $ETODAY = false, $YESTERDAY = false, $YEAR = false;
+		static $TODAY = false, $ETODAY = false, $YESTERDAY = false, $YEARCUTOFF = false;
 		if (!$ETODAY) $ETODAY = strtotime('today 23:59:59');
 		if ($ts > $ETODAY) // TODO: Do we need strings for future too?
 			return date('d.m.Y H:i', $ts);
@@ -505,8 +505,8 @@ SADFACE;
 		if (!$YESTERDAY) $YESTERDAY = strtotime('yesterday 0:00');
 		if ($ts >= $YESTERDAY)
 			return Dictionary::translate('lang_yesterday') . ' ' . date('H:i', $ts);
-		if (!$YEAR) $YEAR = strtotime('this year 1/1');
-		if ($ts >= $YEAR)
+		if (!$YEARCUTOFF) $YEARCUTOFF = min(strtotime('-3 month'), strtotime('this year 1/1'));
+		if ($ts >= $YEARCUTOFF)
 			return date('d.m. H:i', $ts);
 		return date('d.m.Y', $ts);
 	}
-- 
cgit v1.2.3-55-g7522