Merge branch 'master' into bugfix/20002-Superfluous_query_on_HEAD_request_in_serializer

xicond · web-flow · commit c1315b9cd60b · 2023-10-20T16:22:55.000+08:00
diff --git a/framework/helpers/BaseFormatConverter.php b/framework/helpers/BaseFormatConverter.php
@@ -103,7 +103,7 @@ public static function convertDateIcuToPhp($pattern, $type = 'date', $locale = n
     {
         if (isset(self::$_icuShortFormats[$pattern])) {
             if (extension_loaded('intl')) {
-                $pattern = static::createFormatter($locale, $type, $pattern);
+                $pattern = self::createFormatter($locale, $type, $pattern);
             } else {
                 return static::$phpFallbackDatePatterns[$pattern][$type];
             }
@@ -347,7 +347,7 @@ public static function convertDateIcuToJui($pattern, $type = 'date', $locale = n
     {
         if (isset(self::$_icuShortFormats[$pattern])) {
             if (extension_loaded('intl')) {
-                $pattern = static::createFormatter($locale, $type, $pattern);
+                $pattern = self::createFormatter($locale, $type, $pattern);
             } else {
                 return static::$juiFallbackDatePatterns[$pattern][$type];
             }

Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ public static function convertDateIcuToPhp($pattern, $type = 'date', $locale = n`
`103`	`103`	`{`
`104`	`104`	`if (isset(self::$_icuShortFormats[$pattern])) {`
`105`	`105`	`if (extension_loaded('intl')) {`
`106`		`- $pattern = static::createFormatter($locale, $type, $pattern);`
	`106`	`+ $pattern = self::createFormatter($locale, $type, $pattern);`
`107`	`107`	`} else {`
`108`	`108`	`return static::$phpFallbackDatePatterns[$pattern][$type];`
`109`	`109`	`}`
`@@ -347,7 +347,7 @@ public static function convertDateIcuToJui($pattern, $type = 'date', $locale = n`
`347`	`347`	`{`
`348`	`348`	`if (isset(self::$_icuShortFormats[$pattern])) {`
`349`	`349`	`if (extension_loaded('intl')) {`
`350`		`- $pattern = static::createFormatter($locale, $type, $pattern);`
	`350`	`+ $pattern = self::createFormatter($locale, $type, $pattern);`
`351`	`351`	`} else {`
`352`	`352`	`return static::$juiFallbackDatePatterns[$pattern][$type];`
`353`	`353`	`}`