Changeset 58190

Timestamp:

05/23/2024 10:43:27 PM (6 months ago)

Author:

dmsnell

Message:

HTML API: Respect class_name query arg in HTML_Processor::next_tag()

Previously the HTML Process was ignoring the class_name argument in
the next_tag() query if it existed. This was wrong and would lead to
calling code finding the wrong tag if provided.

This patch adds the class detection code back into next_tag() to fix
the bug.

Developed in ​https://github.com/WordPress/wordpress-develop/pull/6618
Discussed in https://core.trac.wordpress.org/ticket/58517

See #58517.
Follow-up to [56274].
Props: dmsnell, jonsurrell.

File:

• trunk/src/wp-includes/html-api/class-wp-html-processor.php (modified) (2 diffs)

trunk/src/wp-includes/html-api/class-wp-html-processor.php

@@ -387 +387 @@
         }
 
+        $needs_class = ( isset( $query['class_name'] ) && is_string( $query['class_name'] ) )
+            ? $query['class_name']
+            : null;
+
         if ( ! ( array_key_exists( 'breadcrumbs', $query ) && is_array( $query['breadcrumbs'] ) ) ) {
             while ( $this->step() ) {
                 if ( '#tag' !== $this->get_token_type() ) {
+                    continue;
+                }
+
+                if ( isset( $needs_class ) && ! $this->has_class( $needs_class ) ) {
                     continue;
                 }
@@ -415 +423 @@
         while ( $match_offset > 0 && $this->step() ) {
             if ( '#tag' !== $this->get_token_type() ) {
+                continue;
+            }
+
+            if ( isset( $needs_class ) && ! $this->has_class( $needs_class ) ) {
                 continue;
             }