Changeset 7393

Timestamp:

12/29/2025 06:59:13 PM (4 weeks ago)

Author:

johnjamesjacoby

Message:

Common - Formatting: Properly fallback the UTF8/mb display name formatter.

This change prevents deprecation notices when more modern UTF8 handling is available, preventing unnecessarily falling back to seems_utf8().

Follow-up to r7364.

See #2141.

In trunk, for 2.7.

File:

• trunk/src/includes/common/formatting.php (modified) (1 diff)

trunk/src/includes/common/formatting.php

@@ -838 +838 @@
 
     // WordPress 6.9 and higher
-    if ( function_exists( 'wp_is_valid_utf8' ) && ! wp_is_valid_utf8( $display_name ) ) {
-        $retval = _wp_utf8_encode_fallback( $display_name );
+    if ( function_exists( 'wp_is_valid_utf8' ) ) {
+        if ( ! wp_is_valid_utf8( $display_name ) ) {
+            $retval = _wp_utf8_encode_fallback( $display_name );
+        }
 
     // Fallback to mbstring library if extension is loaded
-    } elseif ( function_exists( 'mb_check_encoding' ) && ! mb_check_encoding( $display_name, 'UTF-8' ) ) {
-        $retval = mb_convert_encoding( $display_name, 'UTF-8', 'ISO-8859-1' );
+    } elseif ( function_exists( 'mb_check_encoding' ) ) {
+        if ( ! mb_check_encoding( $display_name, 'UTF-8' ) ) {
+            $retval = mb_convert_encoding( $display_name, 'UTF-8', 'ISO-8859-1' );
+        }
 
     // Fallback to deprecated WordPress & PHP functions