Changeset 45837

Timestamp:

08/19/2019 04:23:27 AM (5 years ago)

Author:

SergeyBiryukov

Message:

Formatting: Don't convert smilies in ignored tags that have attributes.

Smilies in ignored tags are not supposed to be converted to emoji, but this can malfunction if the tag has attributes. For example, the Preformatted block with add a class to the <pre> tag.

Props pento, jikamens.
Merges [45569] to the 5.2 branch.
Fixes #47489.

Location:

branches/5.2

Files:

• . (modified) (1 prop)
• src/wp-includes/formatting.php (modified) (1 diff)
• tests/phpunit/tests/formatting/Smilies.php (modified) (1 diff)

branches/5.2/src/wp-includes/formatting.php

@@ -3229 +3229 @@
 
             // If we're in an ignore block, wait until we find its closing tag
-            if ( '' == $ignore_block_element && preg_match( '/^<(' . $tags_to_ignore . ')>/', $content, $matches ) ) {
+            if ( '' == $ignore_block_element && preg_match( '/^<(' . $tags_to_ignore . ')[^>]*>/', $content, $matches ) ) {
                 $ignore_block_element = $matches[1];
             }

branches/5.2/tests/phpunit/tests/formatting/Smilies.php

@@ -147 +147 @@
         $includes_path = includes_url( 'images/smilies/' );
 
-        $in_str  = 'Do we ingore smilies ;-) in ' . $element . ' tags <' . $element . '>My Content Here :?: </' . $element . '>';
-        $exp_str = "Do we ingore smilies \xf0\x9f\x98\x89 in $element tags <$element>My Content Here :?: </$element>";
+        $in_str  = 'Do we ingore smilies ;-) in ' . $element . ' tags <' . $element . ' class="foo">My Content Here :?: </' . $element . '>';
+        $exp_str = "Do we ingore smilies \xf0\x9f\x98\x89 in $element tags <$element class=\"foo\">My Content Here :?: </$element>";
 
         // standard smilies, use_smilies: ON