Ticket #48022: 48022.6.diff

src/wp-includes/formatting.php

@@ -2835 +2835 @@
                 return $matches[0];
         }
 
-        return $matches[1] . "<a href=\"$url\" rel=\"nofollow\">$url</a>" . $suffix;
+        if ( 'comment_text' === current_filter() ) {
+                $rel = 'nofollow ugc';
+        } else {
+                $rel = 'nofollow';
+        }
+
+        /**
+         * Filters the rel value that is added to URL matches converted to links.
+         *
+         * @since 5.3.0
+         *
+         * @param string $rel The rel value.
+         * @param string $url The matched URL being converted to a link tag.
+         */
+        $rel = apply_filters( 'make_clickable_rel', $rel, $url );
+        $rel = esc_attr( $rel );
+
+        return $matches[1] . "<a href=\"$url\" rel=\"$rel\">$url</a>" . $suffix;
 }
 
 /**
@@ -2865 +2882 @@
                 return $matches[0];
         }
 
-        return $matches[1] . "<a href=\"$dest\" rel=\"nofollow\">$dest</a>$ret";
+        if ( 'comment_text' === current_filter() ) {
+                $rel = 'nofollow ugc';
+        } else {
+                $rel = 'nofollow';
+        }
+
+        /** This filter is documented in wp-includes/formatting.php */
+        $rel = apply_filters( 'make_clickable_rel', $rel, $dest );
+        $rel = esc_attr( $rel );
+
+        return $matches[1] . "<a href=\"$dest\" rel=\"$rel\">$dest</a>$ret";
 }
 
 /**
@@ -3148 +3175 @@
          *
          * @since 5.1.0
          *
-         * @param string The rel values.
+         * @param string $rel       The rel values.
          * @param string $link_html The matched content of the link tag including all HTML attributes.
          */
         $rel = apply_filters( 'wp_targeted_link_rel', 'noopener noreferrer', $link_html );

tests/phpunit/tests/formatting/MakeClickable.php

@@ -375 +375 @@
         }
 
         /**
+         * @ticket 30162
          * @dataProvider data_script_and_style_tags
-         * @ticket 30162
          */
         public function test_dont_link_script_and_style_tags( $tag ) {
                 $this->assertEquals( $tag, make_clickable( $tag ) );
@@ -399 +399 @@
                 );
         }
 
+        /**
+         * @ticket 48022
+         * @dataProvider data_add_rel_ugc_in_comments
+         */
+        public function test_add_rel_ugc_in_comments( $content, $expected ) {
+                $comment_id = self::factory()->comment->create(
+                        array(
+                                'comment_content' => $content,
+                        )
+                );
+
+                ob_start();
+                comment_text( $comment_id );
+                $comment_text = ob_get_clean();
+
+                $this->assertContains( $expected, make_clickable( $comment_text ) );
+        }
+
+        public function data_add_rel_ugc_in_comments() {
+                return array(
+                        array(
+                                'http://wordpress.org',
+                                '<a href="http://wordpress.org" rel="nofollow ugc">http://wordpress.org</a>',
+                        ),
+                        array(
+                                'www.wordpress.org',
+                                '<p><a href="http://www.wordpress.org" rel="nofollow ugc">http://www.wordpress.org</a>',
+                        ),
+                );
+        }
+
 }