Changeset 60502

Timestamp:

07/24/2025 06:47:41 AM (8 months ago)

Author:

jonsurrell

Message:

HTML API: Simplify META tag processing.

META tag processing can be simplified in most cases. Add an early check and return to avoid additional processing.

Developed in ​https://github.com/WordPress/wordpress-develop/pull/9231.

Props jonsurrell, dmsnell.
See #63738.

Location:

trunk

Files:

• src/wp-includes/html-api/class-wp-html-processor.php (modified) (3 diffs)
• tests/phpunit/tests/html-api/wpHtmlProcessorMetaTag.php (added)

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

@@ -1761 +1761 @@
                 $this->insert_html_element( $this->state->current_token );
 
+                // All following conditions depend on "tentative" encoding confidence.
+                if ( 'tentative' !== $this->state->encoding_confidence ) {
+                    return true;
+                }
+
                 /*
                  * > If the active speculative HTML parser is null, then:
@@ -1768 +1773 @@
                  */
                 $charset = $this->get_attribute( 'charset' );
-                if ( is_string( $charset ) && 'tentative' === $this->state->encoding_confidence ) {
+                if ( is_string( $charset ) ) {
                     $this->bail( 'Cannot yet process META tags with charset to determine encoding.' );
                 }
@@ -1785 +1790 @@
                     is_string( $http_equiv ) &&
                     is_string( $content ) &&
-                    0 === strcasecmp( $http_equiv, 'Content-Type' ) &&
-                    'tentative' === $this->state->encoding_confidence
+                    0 === strcasecmp( $http_equiv, 'Content-Type' )
                 ) {
                     $this->bail( 'Cannot yet process META tags with http-equiv Content-Type to determine encoding.' );