Changeset 7364

Timestamp:

11/17/2025 05:00:49 AM (3 months ago)

Author:

johnjamesjacoby

Message:

Component - Users: Support wp_is_valid_utf8() for UTF-8 display names.

This commit adds support for a new function, introduced in WordPress 6.9, to work around UTF-8 deprecations in PHP8.4.

In trunk, for 2.7.

See #2141.

File:

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

trunk/src/includes/common/formatting.php

@@ -811 +811 @@
     $retval = $display_name;
 
-    // Use the mbstring library if possible
-    if ( function_exists( 'mb_check_encoding' ) && ! mb_check_encoding( $display_name, 'UTF-8' ) ) {
+    // 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 );
+
+    // 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' );
 
-    // Fallback to function that (deprecated in PHP8.2)
+    // Fallback to deprecated WordPress & PHP functions
     } elseif ( seems_utf8( $display_name ) === false ) {
         $retval = utf8_encode( $display_name ); // phpcs:ignore