...

Pushword · Jan 27, 2022 · 77dff09 · 77dff09
1 parent e4742dc
commit 77dff09
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/packages/core/src/Component/EntityFilter/Filter/Date.php b/packages/core/src/Component/EntityFilter/Filter/Date.php
@@ -24,6 +24,7 @@ private function convertDateShortCode(string $string, ?string $locale = null): s
 
         //$string = preg_replace('/date\([\'"]?([a-z% ]+)[\'"]?\)/i',
         //  strftime(strpos('\1', '%') ? '\1': '%\1'), $string);
+        $string = F::preg_replace_str('/date\([\'"]?%?W[\'"]?\)/i', $this->getWinterYear(), $string);
         $string = F::preg_replace_str('/date\([\'"]?%?Y-1[\'"]?\)/i', date('Y', strtotime('-1 year')), $string);
         $string = F::preg_replace_str('/date\([\'"]?%?Y+1[\'"]?\)/i', date('Y', strtotime('next year')), $string);
         $string = F::preg_replace_str('/date\([\'"]?%?Y[\'"]?\)/i', (string) strftime('%Y'), $string);
@@ -33,6 +34,11 @@ private function convertDateShortCode(string $string, ?string $locale = null): s
         return F::preg_replace_str('/date\([\'"]?%?e[\'"]?\)/i', (string) strftime('%e'), $string);
     }
 
+    private function getWinterYear()
+    {
+        return date('m') < 4 ? date('Y') : date('Y', strtotime('next year'));
+    }
+
     private function convertLocale(string $locale): string
     {
         if ('fr' == $locale) {