Merge branch 'trunk' of https://github.com/WordPress/wordpress-develop into trac-64099-improve-hoisted-stylesheet-ordering

Author: westonruter

src/wp-includes/rest-api/class-wp-rest-server.php

@@ -166,8 +166,8 @@ public function __construct() {
 	 *
 	 * @since 4.4.0
 	 *
-	 * @return WP_Error|null|true WP_Error indicates unsuccessful login, null indicates successful
-	 *                            or no authentication provided.
+	 * @return WP_Error|null|true WP_Error if authentication error occurred, null if authentication
+	 *                            method wasn't used, true if authentication succeeded.
 	 */
 	public function check_authentication() {
 		/**
@@ -191,7 +191,7 @@ public function check_authentication() {
 		 *
 		 * @since 4.4.0
 		 *
-		 * @param WP_Error|null|true $errors WP_Error if authentication error, null if authentication
+		 * @param WP_Error|null|true $errors WP_Error if authentication error occurred, null if authentication
 		 *                                   method wasn't used, true if authentication succeeded.
 		 */
 		return apply_filters( 'rest_authentication_errors', null );

src/wp-includes/script-loader.php

@@ -3442,12 +3442,9 @@ function wp_enqueue_command_palette_assets() {
 			}
 
 			// Remove all HTML tags and their contents.
-			$processor  = new WP_HTML_Tag_Processor( $menu_item[0] );
-			$menu_label = '';
-			while ( $processor->next_token() ) {
-				if ( '#text' === $processor->get_token_name() ) {
-					$menu_label .= $processor->get_modifiable_text();
-				}
+			$menu_label = $menu_item[0];
+			while ( preg_match( '/<[^>]*>/', $menu_label ) ) {
+				$menu_label = preg_replace( '/<[^>]*>.*?<\/[^>]*>|<[^>]*\/>|<[^>]*>/s', '', $menu_label );
 			}
 			$menu_label = trim( $menu_label );
 			$menu_url   = '';
@@ -3474,12 +3471,9 @@ function wp_enqueue_command_palette_assets() {
 					}
 
 					// Remove all HTML tags and their contents.
-					$processor     = new WP_HTML_Tag_Processor( $submenu_item[0] );
-					$submenu_label = '';
-					while ( $processor->next_token() ) {
-						if ( '#text' === $processor->get_token_name() ) {
-							$submenu_label .= $processor->get_modifiable_text();
-						}
+					$submenu_label = $submenu_item[0];
+					while ( preg_match( '/<[^>]*>/', $submenu_label ) ) {
+						$submenu_label = preg_replace( '/<[^>]*>.*?<\/[^>]*>|<[^>]*\/>|<[^>]*>/s', '', $submenu_label );
 					}
 					$submenu_label = trim( $submenu_label );
 					$submenu_url   = '';