<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[59469] trunk: HTML API: Make non-body fragment creation methods private.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/59469">59469</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/59469","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>Bernhard Reiter</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2024-11-28 14:25:51 +0000 (Thu, 28 Nov 2024)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>HTML API: Make non-body fragment creation methods private.
The current implementation of `create_fragment` (and the underlying `create_fragment_at_current_node`) allows passing in a context that might result in a tree that cannot be represented by HTML. For example, a user might use `<p>` as context, and attempt to create a fragment that also consists of a paragraph element, `<p>like this`. This would result in a paragraph node nested inside another -- something that can never result from parsing HTML.
To prevent this, this changeset makes `create_fragment_at_current_node` private and limits `create_fragment` to only `<body>` as context, while a comprehensive solution to allow other contexts is being worked on.
Follow-up to <a href="https://core.trac.wordpress.org/changeset/59444">[59444]</a>, <a href="https://core.trac.wordpress.org/changeset/59467">[59467]</a>.
Props jonsurrell, dmsnell, bernhard-reiter.
Fixes <a href="https://core.trac.wordpress.org/ticket/62584">#62584</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludeshtmlapiclasswphtmlprocessorphp">trunk/src/wp-includes/html-api/class-wp-html-processor.php</a></li>
<li><a href="#trunktestsphpunittestshtmlapiwpHtmlProcessorHtml5libphp">trunk/tests/phpunit/tests/html-api/wpHtmlProcessorHtml5lib.php</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestshtmlapiwpHtmlProcessorFragmentParsingphp">trunk/tests/phpunit/tests/html-api/wpHtmlProcessorFragmentParsing.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludeshtmlapiclasswphtmlprocessorphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/html-api/class-wp-html-processor.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/html-api/class-wp-html-processor.php 2024-11-27 21:21:33 UTC (rev 59468)
+++ trunk/src/wp-includes/html-api/class-wp-html-processor.php 2024-11-28 14:25:51 UTC (rev 59469)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -279,44 +279,24 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * form is provided because a context element may have attributes that
</span><span class="cx" style="display: block; padding: 0 10px"> * impact the parse, such as with a SCRIPT tag and its `type` attribute.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Example:
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * ## Current HTML Support
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * // Usually, snippets of HTML ought to be processed in the default `<body>` context:
- * $processor = WP_HTML_Processor::create_fragment( '<p>Hi</p>' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * - The only supported context is `<body>`, which is the default value.
+ * - The only supported document encoding is `UTF-8`, which is the default value.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * // Some fragments should be processed in the correct context like this SVG:
- * $processor = WP_HTML_Processor::create_fragment( '<rect width="10" height="10" />', '<svg>' );
- *
- * // This fragment with TD tags should be processed in a TR context:
- * $processor = WP_HTML_Processor::create_fragment(
- * '<td>1<td>2<td>3',
- * '<table><tbody><tr>'
- * );
- *
- * In order to create a fragment processor at the correct location, the
- * provided fragment will be processed as part of a full HTML document.
- * The processor will search for the last opener tag in the document and
- * create a fragment processor at that location. The document will be
- * forced into "no-quirks" mode by including the HTML5 doctype.
- *
- * For advanced usage and precise control over the context element, use
- * `WP_HTML_Processor::create_full_processor()` and
- * `WP_HTML_Processor::create_fragment_at_current_node()`.
- *
- * UTF-8 is the only allowed encoding. If working with a document that
- * isn't UTF-8, first convert the document to UTF-8, then pass in the
- * converted HTML.
- *
</del><span class="cx" style="display: block; padding: 0 10px"> * @since 6.4.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 6.6.0 Returns `static` instead of `self` so it can create subclass instances.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @since 6.8.0 Can create fragments with any context element.
</del><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $html Input HTML fragment to process.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $context Context element for the fragment. Defaults to `<body>`.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $context Context element for the fragment, must be default of `<body>`.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $encoding Text encoding of the document; must be default of 'UTF-8'.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return static|null The created processor if successful, otherwise null.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public static function create_fragment( $html, $context = '<body>', $encoding = 'UTF-8' ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '<body>' !== $context || 'UTF-8' !== $encoding ) {
+ return null;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $context_processor = static::create_full_parser( "<!DOCTYPE html>{$context}", $encoding );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( null === $context_processor ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return null;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -475,7 +455,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $html Input HTML fragment to process.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return static|null The created processor if successful, otherwise null.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function create_fragment_at_current_node( string $html ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ private function create_fragment_at_current_node( string $html ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $this->get_token_type() !== '#tag' || $this->is_tag_closer() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> _doing_it_wrong(
</span><span class="cx" style="display: block; padding: 0 10px"> __METHOD__,
</span></span></pre></div>
<a id="trunktestsphpunittestshtmlapiwpHtmlProcessorFragmentParsingphp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: trunk/tests/phpunit/tests/html-api/wpHtmlProcessorFragmentParsing.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/html-api/wpHtmlProcessorFragmentParsing.php 2024-11-27 21:21:33 UTC (rev 59468)
+++ trunk/tests/phpunit/tests/html-api/wpHtmlProcessorFragmentParsing.php 2024-11-28 14:25:51 UTC (rev 59469)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,178 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-/**
- * Unit tests covering WP_HTML_Processor fragment parsing functionality.
- *
- * @package WordPress
- * @subpackage HTML-API
- *
- * @since 6.8.0
- *
- * @group html-api
- *
- * @coversDefaultClass WP_HTML_Processor
- */
-class Tests_HtmlApi_WpHtmlProcessorFragmentParsing extends WP_UnitTestCase {
- /**
- * @ticket 62357
- */
- public function test_create_fragment_at_current_node_in_foreign_content() {
- $processor = WP_HTML_Processor::create_full_parser( '<svg>' );
- $this->assertTrue( $processor->next_tag( 'SVG' ) );
-
- $fragment = $processor->create_fragment_at_current_node( "\0preceded-by-nul-byte<rect /><circle></circle><foreignobject><div></div></foreignobject><g>" );
-
- $this->assertSame( 'svg', $fragment->get_namespace() );
- $this->assertTrue( $fragment->next_token() );
-
- /*
- * In HTML parsing, a nul byte would be ignored.
- * In SVG it should be replaced with a replacement character.
- */
- $this->assertSame( '#text', $fragment->get_token_type() );
- $this->assertSame( "\u{FFFD}", $fragment->get_modifiable_text() );
-
- $this->assertTrue( $fragment->next_tag( 'RECT' ) );
- $this->assertSame( 'svg', $fragment->get_namespace() );
-
- $this->assertTrue( $fragment->next_tag( 'CIRCLE' ) );
- $this->assertSame( array( 'HTML', 'SVG', 'CIRCLE' ), $fragment->get_breadcrumbs() );
- $this->assertTrue( $fragment->next_tag( 'foreignObject' ) );
- $this->assertSame( 'svg', $fragment->get_namespace() );
- }
-
- /**
- * @ticket 62357
- */
- public function test_create_fragment_at_current_node_in_foreign_content_integration_point() {
- $processor = WP_HTML_Processor::create_full_parser( '<svg><foreignObject>' );
- $this->assertTrue( $processor->next_tag( 'foreignObject' ) );
-
- $fragment = $processor->create_fragment_at_current_node( "<image>\0not-preceded-by-nul-byte<rect />" );
-
- // Nothing has been processed, the html namespace should be used for parsing as an integration point.
- $this->assertSame( 'html', $fragment->get_namespace() );
-
- // HTML parsing transforms IMAGE into IMG.
- $this->assertTrue( $fragment->next_tag( 'IMG' ) );
-
- $this->assertTrue( $fragment->next_token() );
-
- // In HTML parsing, the nul byte is ignored and the text is reached.
- $this->assertSame( '#text', $fragment->get_token_type() );
- $this->assertSame( 'not-preceded-by-nul-byte', $fragment->get_modifiable_text() );
-
- /*
- * svg:foreignObject is an HTML integration point, so the processor should be in the HTML namespace.
- * RECT is an HTML element here, meaning it may have the self-closing flag but does not self-close.
- */
- $this->assertTrue( $fragment->next_tag( 'RECT' ) );
- $this->assertSame( array( 'HTML', 'FOREIGNOBJECT', 'RECT' ), $fragment->get_breadcrumbs() );
- $this->assertSame( 'html', $fragment->get_namespace() );
- $this->assertTrue( $fragment->has_self_closing_flag() );
- $this->assertTrue( $fragment->expects_closer() );
- }
-
- /**
- * @expectedIncorrectUsage WP_HTML_Processor::create_fragment_at_current_node
- * @ticket 62357
- */
- public function test_prevent_fragment_creation_on_closers() {
- $processor = WP_HTML_Processor::create_full_parser( '<p></p>' );
- $processor->next_tag( 'P' );
- $processor->next_tag(
- array(
- 'tag_name' => 'P',
- 'tag_closers' => 'visit',
- )
- );
- $this->assertSame( 'P', $processor->get_tag() );
- $this->assertTrue( $processor->is_tag_closer() );
- $this->assertNull( $processor->create_fragment_at_current_node( '<i>fragment HTML</i>' ) );
- }
-
- /**
- * Verifies that the fragment parser doesn't allow invalid context nodes.
- *
- * This includes void elements and self-contained elements because they can
- * contain no inner HTML. Operations on self-contained elements should occur
- * through methods such as {@see WP_HTML_Tag_Processor::set_modifiable_text}.
- *
- * @ticket 62584
- *
- * @dataProvider data_invalid_fragment_contexts
- *
- * @param string $context Invalid context node for fragment parser.
- */
- public function test_rejects_invalid_fragment_contexts( string $context, string $doing_it_wrong_method_name ) {
- $this->setExpectedIncorrectUsage( "WP_HTML_Processor::{$doing_it_wrong_method_name}" );
- $this->assertNull(
- WP_HTML_Processor::create_fragment( 'just a test', $context ),
- "Should not have been able to create a fragment parser with context node {$context}"
- );
- }
-
- /**
- * Data provider.
- *
- * @return array[]
- */
- public static function data_invalid_fragment_contexts() {
- return array(
- /*
- * Invalid contexts.
- */
- /*
- * The text node is confused with a virtual body open tag.
- * This should fail to set a bookmark in `create_fragment`
- * but currently does not, it slips through and fails in
- * `create_fragment_at_current_node`.
- */
- 'Invalid text' => array( 'just some text', 'create_fragment_at_current_node' ),
- 'Invalid comment' => array( '<!-- comment -->', 'create_fragment' ),
- 'Invalid closing' => array( '</div>', 'create_fragment' ),
- 'Invalid DOCTYPE' => array( '<!DOCTYPE html>', 'create_fragment' ),
- /*
- * PLAINTEXT should appear in the unsupported elements, but at the
- * moment it's completely unsupported by the processor so
- * the context element cannot be found.
- */
- 'Unsupported PLAINTEXT' => array( '<plaintext>', 'create_fragment' ),
-
- /*
- * Invalid contexts.
- */
- 'AREA' => array( '<area>', 'create_fragment_at_current_node' ),
- 'BASE' => array( '<base>', 'create_fragment_at_current_node' ),
- 'BASEFONT' => array( '<basefont>', 'create_fragment_at_current_node' ),
- 'BGSOUND' => array( '<bgsound>', 'create_fragment_at_current_node' ),
- 'BR' => array( '<br>', 'create_fragment_at_current_node' ),
- 'COL' => array( '<table><colgroup><col>', 'create_fragment_at_current_node' ),
- 'EMBED' => array( '<embed>', 'create_fragment_at_current_node' ),
- 'FRAME' => array( '<frameset><frame>', 'create_fragment_at_current_node' ),
- 'HR' => array( '<hr>', 'create_fragment_at_current_node' ),
- 'IMG' => array( '<img>', 'create_fragment_at_current_node' ),
- 'INPUT' => array( '<input>', 'create_fragment_at_current_node' ),
- 'KEYGEN' => array( '<keygen>', 'create_fragment_at_current_node' ),
- 'LINK' => array( '<link>', 'create_fragment_at_current_node' ),
- 'META' => array( '<meta>', 'create_fragment_at_current_node' ),
- 'PARAM' => array( '<param>', 'create_fragment_at_current_node' ),
- 'SOURCE' => array( '<source>', 'create_fragment_at_current_node' ),
- 'TRACK' => array( '<track>', 'create_fragment_at_current_node' ),
- 'WBR' => array( '<wbr>', 'create_fragment_at_current_node' ),
-
- /*
- * Unsupported elements. Include a tag closer to ensure the element can be found
- * and does not pause the parser at an incomplete token.
- */
- 'IFRAME' => array( '<iframe></iframe>', 'create_fragment_at_current_node' ),
- 'NOEMBED' => array( '<noembed></noembed>', 'create_fragment_at_current_node' ),
- 'NOFRAMES' => array( '<noframes></noframes>', 'create_fragment_at_current_node' ),
- 'SCRIPT' => array( '<script></script>', 'create_fragment_at_current_node' ),
- 'SCRIPT with type' => array( '<script type="javascript"></script>', 'create_fragment_at_current_node' ),
- 'STYLE' => array( '<style></style>', 'create_fragment_at_current_node' ),
- 'TEXTAREA' => array( '<textarea></textarea>', 'create_fragment_at_current_node' ),
- 'TITLE' => array( '<title></title>', 'create_fragment_at_current_node' ),
- 'XMP' => array( '<xmp></xmp>', 'create_fragment_at_current_node' ),
- );
- }
-}
</del></span></pre></div>
<a id="trunktestsphpunittestshtmlapiwpHtmlProcessorHtml5libphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/html-api/wpHtmlProcessorHtml5lib.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/html-api/wpHtmlProcessorHtml5lib.php 2024-11-27 21:21:33 UTC (rev 59468)
+++ trunk/tests/phpunit/tests/html-api/wpHtmlProcessorHtml5lib.php 2024-11-28 14:25:51 UTC (rev 59469)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -138,6 +138,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool True if the test case should be skipped. False otherwise.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> private static function should_skip_test( ?string $test_context_element, string $test_name ): bool {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( null !== $test_context_element && 'body' !== $test_context_element ) {
+ return true;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( array_key_exists( $test_name, self::SKIP_TESTS ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -153,63 +157,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string|null Tree structure of parsed HTML, if supported, else null.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> private static function build_tree_representation( ?string $fragment_context, string $html ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $fragment_context ) {
- /*
- * If the string of characters starts with "svg ", the context
- * element is in the SVG namespace and the substring after
- * "svg " is the local name. If the string of characters starts
- * with "math ", the context element is in the MathML namespace
- * and the substring after "math " is the local name.
- * Otherwise, the context element is in the HTML namespace and
- * the string is the local name.
- */
- if ( str_starts_with( $fragment_context, 'svg ' ) ) {
- $tag_name = substr( $fragment_context, 4 );
- if ( 'svg' === $tag_name ) {
- $fragment_context_html = '<svg>';
- } else {
- $fragment_context_html = "<svg><{$tag_name}>";
- }
- } elseif ( str_starts_with( $fragment_context, 'math ' ) ) {
- $tag_name = substr( $fragment_context, 5 );
- if ( 'math' === $tag_name ) {
- $fragment_context_html = '<math>';
- } else {
- $fragment_context_html = "<math><{$tag_name}>";
- }
- } else {
- // Tags that only appear in tables need a special case.
- if ( in_array(
- $fragment_context,
- array(
- 'caption',
- 'col',
- 'colgroup',
- 'tbody',
- 'td',
- 'tfoot',
- 'th',
- 'thead',
- 'tr',
- ),
- true
- ) ) {
- $fragment_context_html = "<table><{$fragment_context}>";
- } else {
- $fragment_context_html = "<{$fragment_context}>";
- }
- }
-
- $processor = WP_HTML_Processor::create_fragment( $html, $fragment_context_html );
-
- if ( null === $processor ) {
- throw new WP_HTML_Unsupported_Exception( "Could not create a parser with the given fragment context: {$fragment_context}.", '', 0, '', array(), array() );
- }
- } else {
- $processor = WP_HTML_Processor::create_full_parser( $html );
- if ( null === $processor ) {
- throw new Exception( 'Could not create a full parser.' );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $processor = $fragment_context
+ ? WP_HTML_Processor::create_fragment( $html, "<{$fragment_context}>" )
+ : WP_HTML_Processor::create_full_parser( $html );
+ if ( null === $processor ) {
+ throw new WP_HTML_Unsupported_Exception( "Could not create a parser with the given fragment context: {$fragment_context}.", '', 0, '', array(), array() );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $output = '';
</span></span></pre>
</div>
</div>
</body>
</html>