Skip to content

Command Palette: Use WP_HTML_Processor and WP_HTML_Decoder to generate menu label and menu URL #10480

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: trunk
Choose a base branch
from
Open

Command Palette: Use WP_HTML_Processor and WP_HTML_Decoder to generate menu label and menu URL #10480

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8b09509
Command Palette: Use WP_HTML_Processor and WP_HTML_Decoder to generat…
t-hamano Nov 7, 2025
7a03b40
Extract common logic
t-hamano Nov 7, 2025
1f16c56
Fix PHPCS error
t-hamano Nov 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 25 additions & 15 deletions src/wp-includes/script-loader.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3434,26 +3434,42 @@ function wp_enqueue_command_palette_assets() {
'is_network_admin' => is_network_admin(),
);

// Only collect text nodes at root level (not wrapped in any HTML tags).
$extract_root_text = static function ( $label ) {
if ( '' === $label ) {
return '';
}

$processor = WP_HTML_Processor::create_fragment( $label );
$text_parts = array();

if ( $processor->next_token() ) {
$root_depth = $processor->get_current_depth();
do {
if ( '#text' === $processor->get_token_type() && $root_depth === $processor->get_current_depth() ) {
$text_parts[] = $processor->get_modifiable_text();
}
} while ( $processor->next_token() );
}

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] ) ) {
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];

if ( preg_match( '/\.php($|\?)/', $menu_slug ) || wp_http_validate_url( $menu_slug ) ) {
$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 ) );
}

if ( $menu_url ) {
Expand All @@ -3470,21 +3486,15 @@ function wp_enqueue_command_palette_assets() {
continue;
}

// 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];

if ( preg_match( '/\.php($|\?)/', $submenu_slug ) || wp_http_validate_url( $submenu_slug ) ) {
$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(
'label' => sprintf(
Expand Down
Loading