diff options
author | Simon Rettberg | 2019-01-02 15:26:47 +0100 |
---|---|---|
committer | Simon Rettberg | 2019-01-02 15:26:47 +0100 |
commit | 580dbe86c8cfd1f5a83d77821d0d02cf61cdc95d (patch) | |
tree | da966bb42cdbe929193685ddf4d5115f847057e0 /inc | |
parent | [serversetup-bwlp] Add column to override default menuentry of location (diff) | |
parent | [inc/Util] Improve prettyTime year cutoff logic (diff) | |
download | slx-admin-580dbe86c8cfd1f5a83d77821d0d02cf61cdc95d.tar.gz slx-admin-580dbe86c8cfd1f5a83d77821d0d02cf61cdc95d.tar.xz slx-admin-580dbe86c8cfd1f5a83d77821d0d02cf61cdc95d.zip |
Merge branch 'master' into ipxe
Diffstat (limited to 'inc')
-rw-r--r-- | inc/util.inc.php | 6 |
1 files 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); } |