Changeset 61310

Timestamp:

11/26/2025 04:26:45 AM (3 weeks ago)

Author:

wildworks

Message:

Command Palette: Use HTML API for more reliable menu labels and URLs.

Replace regex-based HTML parsing with WP_HTML_Tag_Processor to properly extract text nodes from menu labels. This ensures only root-level text nodes are
collected.

Additionally, replace html_entity_decode() with WP_HTML_Decoder::decode_attribute() with the menu URL for consistent attribute decoding.

Follow-up to [61124], [61126], [61127], [61142].

Props: dmsnell, madhavishah01, peterwilsoncc, wildworks.
Fixes #64233.

File:

• trunk/src/wp-includes/script-loader.php (modified) (4 diffs)

trunk/src/wp-includes/script-loader.php

@@ -3439 +3439 @@
     );
 
+    /**
+     * Extracts root-level text nodes from HTML string.
+     *
+     * @ignore
+     * @param string $label HTML string to extract text from.
+     * @return string Extracted text content, trimmed.
+     */
+    $extract_root_text = static function ( string $label ): string {
+        if ( '' === $label ) {
+            return '';
+        }
+
+        $processor  = new WP_HTML_Tag_Processor( $label );
+        $text_parts = array();
+        $depth      = 0;
+
+        while ( $processor->next_token() ) {
+            $token_type = $processor->get_token_type();
+
+            if ( '#text' === $token_type ) {
+                if ( 0 === $depth ) {
+                    $text_parts[] = $processor->get_modifiable_text();
+                }
+                continue;
+            }
+
+            if ( '#tag' !== $token_type ) {
+                continue;
+            }
+
+            if ( $processor->is_tag_closer() ) {
+                if ( $depth > 0 ) {
+                    --$depth;
+                }
+                continue;
+            }
+
+            $token_name = $processor->get_tag();
+            if ( $token_name && ! WP_HTML_Processor::is_void( $token_name ) ) {
+                ++$depth;
+            }
+        }
+
+        return trim( implode( '', $text_parts ) );
+    };
+
     if ( $menu ) {
         $menu_commands = array();
         foreach ( $menu as $menu_item ) {
-            if ( empty( $menu_item[0] ) || ! empty( $menu_item[1] ) && ! current_user_can( $menu_item[1] ) ) {
+            if ( empty( $menu_item[0] ) || ! is_string( $menu_item[0] ) || ! empty( $menu_item[1] ) && ! current_user_can( $menu_item[1] ) ) {
                 continue;
             }
 
-            // Remove all HTML tags and their contents.
-            $menu_label = $menu_item[0];
-            while ( preg_match( '/<[^>]*>/', $menu_label ) ) {
-                $menu_label = preg_replace( '/<[^>]*>.*?<\/[^>]*>|<[^>]*\/>|<[^>]*>/s', '', $menu_label );
-            }
-            $menu_label = trim( $menu_label );
+            $menu_label = $extract_root_text( $menu_item[0] );
             $menu_url   = '';
             $menu_slug  = $menu_item[2];
@@ -3458 +3499 @@
                 $menu_url = $menu_slug;
             } elseif ( ! empty( menu_page_url( $menu_slug, false ) ) ) {
-                $menu_url = html_entity_decode( menu_page_url( $menu_slug, false ), ENT_QUOTES, get_bloginfo( 'charset' ) );
+                $menu_url = WP_HTML_Decoder::decode_attribute( menu_page_url( $menu_slug, false ) );
             }
 
@@ -3475 +3516 @@
                     }
 
-                    // Remove all HTML tags and their contents.
-                    $submenu_label = $submenu_item[0];
-                    while ( preg_match( '/<[^>]*>/', $submenu_label ) ) {
-                        $submenu_label = preg_replace( '/<[^>]*>.*?<\/[^>]*>|<[^>]*\/>|<[^>]*>/s', '', $submenu_label );
-                    }
-                    $submenu_label = trim( $submenu_label );
+                    $submenu_label = $extract_root_text( $submenu_item[0] );
                     $submenu_url   = '';
                     $submenu_slug  = $submenu_item[2];
@@ -3487 +3523 @@
                         $submenu_url = $submenu_slug;
                     } elseif ( ! empty( menu_page_url( $submenu_slug, false ) ) ) {
-                        $submenu_url = html_entity_decode( menu_page_url( $submenu_slug, false ), ENT_QUOTES, get_bloginfo( 'charset' ) );
+                        $submenu_url = WP_HTML_Decoder::decode_attribute( menu_page_url( $submenu_slug, false ) );
                     }
-
                     if ( $submenu_url ) {
                         $menu_commands[] = array(