Changeset 45569 for trunk

Timestamp:

06/27/2019 02:04:17 AM (5 years ago)

Author:

pento

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.
Fixes #47489.

Location:

trunk

Files:

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

trunk/src/wp-includes/formatting.php

@@ -3231 +3231 @@
 
             // 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];
             }

trunk/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