Add yet another case to DateTimeFormat::fix

- Address https://github.com/friendica/friendica/issues/12488#issuecomment-1372637862

diff --git a/src/Util/DateTimeFormat.php b/src/Util/DateTimeFormat.php
index bbdf2d2c655f19a9d250c55d487b1c3f3ea3f0e0..df7b6d92c4ef18f647ea80f2c7cad72159f047e5 100644 (file)
--- a/src/Util/DateTimeFormat.php
+++ b/src/Util/DateTimeFormat.php
@@ -182,8 +182,8 @@ class DateTimeFormat
         */
        public static function fix(string $dateString): string
        {
-               $search  = ['Mär', 'März', 'Mai', 'Juni', 'Juli', 'Okt', 'Dez', 'ET' , 'ZZ', ' - ', '+', ' (Coordinated Universal Time)'];
-               $replace = ['Mar', 'Mar' , 'May', 'Jun' , 'Jul' , 'Oct', 'Dec', 'EST', 'Z' , ', ' , '+'     , ''];
+               $search  = ['Mär', 'März', 'Mai', 'Juni', 'Juli', 'Okt', 'Dez', 'ET' , 'ZZ', ' - ', '+', '+', ' (Coordinated Universal Time)'];
+               $replace = ['Mar', 'Mar' , 'May', 'Jun' , 'Jul' , 'Oct', 'Dec', 'EST', 'Z' , ', ' , '+'     , '+'        , ''];
 
                $dateString = str_replace($search, $replace, $dateString);
 

diff --git a/tests/src/Util/DateTimeFormatTest.php b/tests/src/Util/DateTimeFormatTest.php
index 82a294dd6e6ada4363e5c6d1eabe322674f1c505..c4e2127bad9cd44f0063f2a06d666e5a40b4db16 100644 (file)
--- a/tests/src/Util/DateTimeFormatTest.php
+++ b/tests/src/Util/DateTimeFormatTest.php
@@ -130,6 +130,10 @@ class DateTimeFormatTest extends MockedTest
                        '(Coordinated Universal Time)' => [
                                'expectedDate' => '2022-12-30T14:29:10+00:00',
                                'dateString' => 'Fri Dec 30 2022 14:29:10 GMT+0000 (Coordinated Universal Time)',
+                       ],
+                       'Double HTML encode' => [
+                               'expectedDate' => '2015-05-22T08:48:00+12:00',
+                               'dateString' => '2015-05-22T08:48:00+12:00'
                        ]
                ];
        }