Changeset 54814

Timestamp:

11/11/2022 03:29:13 PM (7 months ago)

Author:

SergeyBiryukov

Message:

Formatting: Check that both normalizer_* functions exist in remove_accents().

This applies to:

• normalizer_is_normalized()
• normalizer_normalize()

Includes removing the Normalizer::FORM_C constant as a parameter, since it is the default value for both functions and does not need to be explicitly passed. This avoids a fatal error if a plugin includes polyfill for any of the functions but the Normalizer class has a different namespace, for example when using the Symfony polyfill.

Follow-up to [53754].

Props hellofromTonya, costdev, desrosj, mukesh27, zodiac1978, jchambo, gisgeo, SergeyBiryukov.
Merges [54813] to the 6.1 branch.
Fixes #56980.

Location:

branches/6.1

Files:

• . (modified) (1 prop)
• src/wp-includes/formatting.php (modified) (1 diff)

branches/6.1/src/wp-includes/formatting.php

@@ -1602 +1602 @@
         // Unicode sequence normalization from NFD (Normalization Form Decomposed)
         // to NFC (Normalization Form [Pre]Composed), the encoding used in this function.
-        if ( function_exists( 'normalizer_normalize' ) ) {
-            if ( ! normalizer_is_normalized( $string, Normalizer::FORM_C ) ) {
-                $string = normalizer_normalize( $string, Normalizer::FORM_C );
+        if ( function_exists( 'normalizer_is_normalized' )
+            && function_exists( 'normalizer_normalize' )
+        ) {
+            if ( ! normalizer_is_normalized( $string ) ) {
+                $string = normalizer_normalize( $string );
             }
         }