From 8269a944aac168363bcf2fdbe4161c8cc0347cec Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rapha=C3=ABl=20Gertz?= Date: Sun, 29 Nov 2020 06:59:24 +0100 Subject: [PATCH] Avoid double month append --- Repository/SessionRepository.php | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/Repository/SessionRepository.php b/Repository/SessionRepository.php index 2a11c59..afe7335 100644 --- a/Repository/SessionRepository.php +++ b/Repository/SessionRepository.php @@ -156,10 +156,14 @@ class SessionRepository extends \Doctrine\ORM\EntityRepository { 'sessions' => [] ]; - //Append month for first day of month + //Detect month change if ($month != $date->format('m')) { $month = $date->format('m'); - $calendar[$Ymd]['title'] .= '/'.$month; + //Append month for first day of month + //XXX: except if today to avoid double add + if ($date->format('U') != strtotime('today')) { + $calendar[$Ymd]['title'] .= '/'.$month; + } } //Deal with today if ($date->format('U') == ($today = strtotime('today'))) { @@ -316,10 +320,14 @@ class SessionRepository extends \Doctrine\ORM\EntityRepository { 'sessions' => [] ]; - //Append month for first day of month + //Detect month change if ($month != $date->format('m')) { $month = $date->format('m'); - $calendar[$Ymd]['title'] .= '/'.$month; + //Append month for first day of month + //XXX: except if today to avoid double add + if ($date->format('U') != strtotime('today')) { + $calendar[$Ymd]['title'] .= '/'.$month; + } } //Deal with today if ($date->format('U') == ($today = strtotime('today'))) { -- 2.41.0