fix: resolves issues with archive lists and dates (#1325)

* fix: resolves issues with archive lists and dates * fix: lint * fix: check for common date formats before assuming its a date --------- Co-authored-by: Sebastian Thulin <[email protected]>
helsingborg-stad · Feb 11, 2025 · 0cc028e · 0cc028e
1 parent 76d5a15
commit 0cc028e
Showing 1 changed file with 24 additions and 3 deletions.
diff --git a/library/Controller/Archive.php b/library/Controller/Archive.php
@@ -627,7 +627,7 @@ protected function getListItems(array $posts): array
                         'href'    => WP::getPermalink($post->id),
                         'columns' => [
                             $post->postTitle,
-                            $post->post_date = $post->getArchiveDateTimestamp()
+                            $post->post_date = wp_date(get_option('date_format'), $post->getArchiveDateTimestamp())
                         ]
                     ];
 
@@ -657,8 +657,29 @@ private function prepareTaxonomyColumns(PostObjectInterface $post, $preparedPost
                     continue;
                 }
 
-                $termNames = array_map(fn($term) => $term->name, $terms);
-                array_unshift($termNames, $post->getArchiveDateTimestamp() ?? '');
+                $termNames = array_map(function ($term) {
+                    $name = trim($term->name ?? '');
+
+                    $datePatterns = [
+                        '/^\d{4}-\d{2}-\d{2}$/',         // YYYY-MM-DD
+                        '/^\d{2}\/\d{2}\/\d{4}$/',       // DD/MM/YYYY or MM/DD/YYYY
+                        '/^\d{2}-\d{2}-\d{4}$/',         // DD-MM-YYYY
+                        '/^\w+ \d{4}$/',                 // "Month YYYY"
+                        '/^\d{1,2} \p{L}+, \d{4}$/u',    // "30 january, 2025"
+                    ];
+                    foreach ($datePatterns as $pattern) {
+                        if (preg_match($pattern, $name)) {
+                            $timestamp = strtotime($name);
+
+                            // Ensure strtotime() returned a valid timestamp
+                            if ($timestamp && $timestamp > 0) {
+                                return wp_date(get_option('date_format'), $timestamp);
+                            }
+                        }
+                    }
+
+                    return $name;
+                }, $terms);
 
                 $preparedPosts['items'][count($preparedPosts['items']) - 1]['columns'][$taxonomy] = join(', ', $termNames);
             }