Changeset 48983

Timestamp:

09/17/2020 10:12:32 AM (4 years ago)

Author:

SergeyBiryukov

Message:

Formatting: Make sure links_add_target() adds the target attribute to the correct tag.

Previously, the attribute could unintentionally be added to a tag that starts with the same characters, e.g. <aside> instead of <a>.

Props antonlukin.
Fixes #51313.

Location:

trunk

Files:

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

trunk/src/wp-includes/formatting.php

@@ -5244 +5244 @@
     $_links_add_target = $target;
     $tags              = implode( '|', (array) $tags );
-    return preg_replace_callback( "!<($tags)([^>]*)>!i", '_links_add_target', $content );
+    return preg_replace_callback( "!<($tags)((\s[^>]*)?)>!i", '_links_add_target', $content );
 }
 

trunk/tests/phpunit/tests/formatting/LinksAddTarget.php

@@ -65 +65 @@
                 'MY CONTENT <div> SOME ADDITIONAL TEXT <a href="XYZ" src="ABC">LINK</a> HERE </div> <span src="ABC" target="_top">END TEXT</span>',
             ),
+            array(
+                'MY CONTENT <aside> SOME ADDITIONAL TEXT <a href="XYZ" src="ABC">LINK</a> HERE </aside> END TEXT',
+                null,
+                null,
+                'MY CONTENT <aside> SOME ADDITIONAL TEXT <a href="XYZ" src="ABC" target="_blank">LINK</a> HERE </aside> END TEXT',
+            ),
+            array(
+                'MY CONTENT <aside class="_blank"> SOME ADDITIONAL TEXT <a href="XYZ" src="ABC">LINK</a> HERE </aside> END TEXT',
+                null,
+                null,
+                'MY CONTENT <aside class="_blank"> SOME ADDITIONAL TEXT <a href="XYZ" src="ABC" target="_blank">LINK</a> HERE </aside> END TEXT',
+            ),
+            array(
+                'MY CONTENT <blockquote>SOME</blockquote> ADDITIONAL TEXT <b>LINK</b> HERE END TEXT',
+                '_blank',
+                array( 'b' ),
+                'MY CONTENT <blockquote>SOME</blockquote> ADDITIONAL TEXT <b target="_blank">LINK</b> HERE END TEXT',
+            ),
+            array(
+                'MY CONTENT <blockquote target="_self">SOME</blockquote> ADDITIONAL TEXT <b>LINK</b> HERE END TEXT',
+                '_blank',
+                array( 'b' ),
+                'MY CONTENT <blockquote target="_self">SOME</blockquote> ADDITIONAL TEXT <b target="_blank">LINK</b> HERE END TEXT',
+            ),
         );
     }