Changeset 45349

Timestamp:

05/17/2019 12:11:06 PM (5 years ago)

Author:

SergeyBiryukov

Message:

Formatting: Adjust wp_targeted_link_rel() to ensure JSON format is preserved and correct quotes are used when adding the missing rel attribute.

Props birgire, TobiasBg, fierevere, audrasjb, SergeyBiryukov.
Merges [45348] to the 5.2 branch.
Fixes #46316, #47244.

Location:

branches/5.2

Files:

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

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

@@ -3095 +3095 @@
         $rel       = 'rel=' . $delimiter . trim( implode( ' ', $parts ) ) . $delimiter;
         $link_html = str_replace( $rel_match[0], $rel, $link_html );
+    } elseif ( preg_match( '|target\s*=\s*?\\\\"|', $link_html ) ) {
+        $link_html .= " rel=\\\"$rel\\\"";
+    } elseif ( preg_match( '#(target|href)\s*=\s*?\'#', $link_html ) ) {
+        $link_html .= " rel='$rel'";
     } else {
         $link_html .= " rel=\"$rel\"";

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

@@ -102 +102 @@
         $this->assertEquals( $expected, $post->post_content );
     }
+
+    /**
+     * Ensure JSON format is preserved when relation attribute (rel) is missing.
+     *
+     * @ticket 46316
+     */
+    public function test_wp_targeted_link_rel_should_preserve_json() {
+        $content  = '<p>Links: <a href=\"\/\" target=\"_blank\">No rel<\/a><\/p>';
+        $expected = '<p>Links: <a href=\"\/\" target=\"_blank\" rel=\"noopener noreferrer\">No rel<\/a><\/p>';
+        $this->assertEquals( $expected, wp_targeted_link_rel( $content ) );
+    }
+
+    /**
+     * Ensure correct quotes are used when relation attribute (rel) is missing.
+     *
+     * @ticket 47244
+     */
+    public function test_wp_targeted_link_rel_should_use_correct_quotes() {
+        $content  = '<p>Links: <a href=\'\/\' target=\'_blank\'>No rel<\/a><\/p>';
+        $expected = '<p>Links: <a href=\'\/\' target=\'_blank\' rel=\'noopener noreferrer\'>No rel<\/a><\/p>';
+        $this->assertEquals( $expected, wp_targeted_link_rel( $content ) );
+
+        $content  = '<p>Links: <a href=\'\/\' target=_blank>No rel<\/a><\/p>';
+        $expected = '<p>Links: <a href=\'\/\' target=_blank rel=\'noopener noreferrer\'>No rel<\/a><\/p>';
+        $this->assertEquals( $expected, wp_targeted_link_rel( $content ) );
+    }
 }