jakob/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #12973 from nupplaphil/bug/datetimeformat

Browse source 
Fix  DateTimeFormat issue
This commit is contained in:
Hypolite Petovan 2023-04-03 13:49:07 -04:00 committed by GitHub
commit e28179c855
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Util/DateTimeFormat.php
View file

@ -182,8 +182,8 @@ class DateTimeFormat
*/ */
public static function fix(string $dateString): string public static function fix(string $dateString): string
{ {
$search = ['Mär', 'März', 'Mai', 'Juni', 'Juli', 'Okt', 'Dez', 'ET' , 'ZZ', ' - ', '+', '+', ' (Coordinated Universal Time)']; $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' , ', ' , '+' , '+' , '']; $replace = ['Mar', 'Mar' , 'May', 'Jun' , 'Jul' , 'Oct', 'Dec', 'EST', 'Z' , ', ' , '+' , '+' , '' , ''];
$dateString = str_replace($search, $replace, $dateString); $dateString = str_replace($search, $replace, $dateString);

6
tests/src/Util/DateTimeFormatTest.php
View file

@ -134,7 +134,11 @@ class DateTimeFormatTest extends MockedTest
'Double HTML encode' => [ 'Double HTML encode' => [
'expectedDate' => '2015-05-22T08:48:00+12:00', 'expectedDate' => '2015-05-22T08:48:00+12:00',
'dateString' => '2015-05-22T08:48:00+12:00' 'dateString' => '2015-05-22T08:48:00+12:00'
] ],
'2023-04-02\T17:22:42+05:30' => [
'expectedDate' => '2023-04-02T17:22:42+05:30',
'dateString' => '2023-04-02\T17:22:42+05:30'
],
]; ];
} }