<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[46349] trunk: Comments: Add `rel="nofollow ugc"` attribute to links in comments.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/46349">46349</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/46349","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2019-09-30 01:29:10 +0000 (Mon, 30 Sep 2019)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Comments: Add `rel="nofollow ugc"` attribute to links in comments.
UGC stands for User Generated Content, and the `ugc` attribute value is recommended for links within user generated content, such as comments and forum posts.
See https://webmasters.googleblog.com/2019/09/evolving-nofollow-new-ways-to-identify.html.
Props audrasjb, joostdevalk, dkarfa, SergeyBiryukov.
Fixes <a href="https://core.trac.wordpress.org/ticket/48022">#48022</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludescommenttemplatephp">trunk/src/wp-includes/comment-template.php</a></li>
<li><a href="#trunksrcwpincludesdefaultfiltersphp">trunk/src/wp-includes/default-filters.php</a></li>
<li><a href="#trunksrcwpincludesformattingphp">trunk/src/wp-includes/formatting.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestsformattingWPRelUgcphp">trunk/tests/phpunit/tests/formatting/WPRelUgc.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludescommenttemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/comment-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/comment-template.php 2019-09-30 00:04:46 UTC (rev 46348)
+++ trunk/src/wp-includes/comment-template.php 2019-09-30 01:29:10 UTC (rev 46349)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -224,7 +224,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $url ) || 'http://' == $url ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $return = $author;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $return = "<a href='$url' rel='external nofollow' class='url'>$author</a>";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $return = "<a href='$url' rel='external nofollow ugc' class='url'>$author</a>";
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre></div>
<a id="trunksrcwpincludesdefaultfiltersphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/default-filters.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/default-filters.php 2019-09-30 00:04:46 UTC (rev 46348)
+++ trunk/src/wp-includes/default-filters.php 2019-09-30 01:29:10 UTC (rev 46349)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -246,7 +246,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'sanitize_title', 'sanitize_title_with_dashes', 10, 3 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'check_comment_flood', 'check_comment_flood_db', 10, 4 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'comment_flood_filter', 'wp_throttle_comment_flood', 10, 3 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-add_filter( 'pre_comment_content', 'wp_rel_nofollow', 15 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+add_filter( 'pre_comment_content', 'wp_rel_ugc', 15 );
</ins><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'comment_email', 'antispambot' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'option_tag_base', '_wp_filter_taxonomy_base' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'option_category_base', '_wp_filter_taxonomy_base' );
</span></span></pre></div>
<a id="trunksrcwpincludesformattingphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/formatting.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/formatting.php 2019-09-30 00:04:46 UTC (rev 46348)
+++ trunk/src/wp-includes/formatting.php 2019-09-30 01:29:10 UTC (rev 46349)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3012,35 +3012,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Adds rel nofollow string to all HTML A elements in content.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Callback to add a rel attribute to HTML A element.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @since 1.5.0
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Will remove already existing string before adding to prevent invalidating (X)HTML.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $text Content that may contain HTML A elements.
- * @return string Converted content.
- */
-function wp_rel_nofollow( $text ) {
- // This is a pre save filter, so text is already escaped.
- $text = stripslashes( $text );
- $text = preg_replace_callback( '|<a (.+?)>|i', 'wp_rel_nofollow_callback', $text );
- return wp_slash( $text );
-}
-
-/**
- * Callback to add rel=nofollow string to HTML A element.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 5.3.0
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Will remove already existing rel="nofollow" and rel='nofollow' from the
- * string to prevent from invalidating (X)HTML.
- *
- * @since 2.3.0
- *
- * @param array $matches Single Match
- * @return string HTML A Element with rel nofollow.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param array $matches Single match.
+ * @param string $rel The rel attribute to add.
+ * @return string HTML A element with the added rel attribute.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function wp_rel_nofollow_callback( $matches ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function wp_rel_callback( $matches, $rel ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $text = $matches[1];
</span><span class="cx" style="display: block; padding: 0 10px"> $atts = wp_kses_hair( $matches[1], wp_allowed_protocols() );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $rel = 'nofollow';
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $atts['href'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( in_array( strtolower( wp_parse_url( $atts['href']['value'], PHP_URL_SCHEME ) ), array( 'http', 'https' ), true ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3051,11 +3035,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $atts['rel'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $parts = array_map( 'trim', explode( ' ', $atts['rel']['value'] ) );
- if ( false === array_search( 'nofollow', $parts ) ) {
- $parts[] = 'nofollow';
- }
- $rel = implode( ' ', $parts );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $parts = array_map( 'trim', explode( ' ', $atts['rel']['value'] ) );
+ $rel_array = array_map( 'trim', explode( ' ', $rel ) );
+ $parts = array_unique( array_merge( $parts, $rel_array ) );
+ $rel = implode( ' ', $parts );
</ins><span class="cx" style="display: block; padding: 0 10px"> unset( $atts['rel'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $html = '';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3072,6 +3055,63 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Adds `rel="nofollow"` string to all HTML A elements in content.
+ *
+ * @since 1.5.0
+ *
+ * @param string $text Content that may contain HTML A elements.
+ * @return string Converted content.
+ */
+function wp_rel_nofollow( $text ) {
+ // This is a pre save filter, so text is already escaped.
+ $text = stripslashes( $text );
+ $rel = 'nofollow';
+ $text = preg_replace_callback(
+ '|<a (.+?)>|i',
+ function( $matches ) use ( $rel ) {
+ return wp_rel_callback( $matches, $rel );
+ },
+ $text
+ );
+ return wp_slash( $text );
+}
+
+/**
+ * Callback to add `rel="nofollow"` string to HTML A element.
+ *
+ * @since 2.3.0
+ * @deprecated 5.3.0 Use wp_rel_callback()
+ *
+ * @param array $matches Single match.
+ * @return string HTML A Element with `rel="nofollow"`.
+ */
+function wp_rel_nofollow_callback( $matches ) {
+ return wp_rel_callback( $matches, 'nofollow' );
+}
+
+/**
+ * Adds `rel="nofollow ugc"` string to all HTML A elements in content.
+ *
+ * @since 5.3.0
+ *
+ * @param string $text Content that may contain HTML A elements.
+ * @return string Converted content.
+ */
+function wp_rel_ugc( $text ) {
+ // This is a pre save filter, so text is already escaped.
+ $text = stripslashes( $text );
+ $rel = 'nofollow ugc';
+ $text = preg_replace_callback(
+ '|<a (.+?)>|i',
+ function( $matches ) use ( $rel ) {
+ return wp_rel_callback( $matches, $rel );
+ },
+ $text
+ );
+ return wp_slash( $text );
+}
+
+/**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Adds rel noreferrer and noopener to all HTML A elements that have a target.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 5.1.0
</span></span></pre></div>
<a id="trunktestsphpunittestsformattingWPRelUgcphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/tests/phpunit/tests/formatting/WPRelUgc.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/WPRelUgc.php (rev 0)
+++ trunk/tests/phpunit/tests/formatting/WPRelUgc.php 2019-09-30 01:29:10 UTC (rev 46349)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,83 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * @group formatting
+ */
+class Tests_Rel_Ugc extends WP_UnitTestCase {
+
+ /**
+ * @ticket 48022
+ */
+ public function test_add_ugc() {
+ $content = '<p>This is some cool <a href="/">Code</a></p>';
+ $expected = '<p>This is some cool <a href=\"/\" rel=\"nofollow ugc\">Code</a></p>';
+ $this->assertEquals( $expected, wp_rel_ugc( $content ) );
+ }
+
+ /**
+ * @ticket 48022
+ */
+ public function test_convert_ugc() {
+ $content = '<p>This is some cool <a href="/" rel="weird">Code</a></p>';
+ $expected = '<p>This is some cool <a href=\"/\" rel=\"weird nofollow ugc\">Code</a></p>';
+ $this->assertEquals( $expected, wp_rel_ugc( $content ) );
+ }
+
+ /**
+ * @ticket 48022
+ * @dataProvider data_wp_rel_ugc
+ */
+ public function test_wp_rel_ugc( $input, $output ) {
+ return $this->assertEquals( wp_slash( $output ), wp_rel_ugc( $input ) );
+ }
+
+ public function data_wp_rel_ugc() {
+ $home_url_http = set_url_scheme( home_url(), 'http' );
+ $home_url_https = set_url_scheme( home_url(), 'https' );
+
+ return array(
+ array(
+ '<a href="">Double Quotes</a>',
+ '<a href="" rel="nofollow ugc">Double Quotes</a>',
+ ),
+ array(
+ '<a href="https://wordpress.org">Double Quotes</a>',
+ '<a href="https://wordpress.org" rel="nofollow ugc">Double Quotes</a>',
+ ),
+ array(
+ "<a href='https://wordpress.org'>Single Quotes</a>",
+ "<a href='https://wordpress.org' rel=\"nofollow ugc\">Single Quotes</a>",
+ ),
+ array(
+ '<a href="https://wordpress.org" title="Title">Multiple attributes</a>',
+ '<a href="https://wordpress.org" title="Title" rel="nofollow ugc">Multiple attributes</a>',
+ ),
+ array(
+ '<a title="Title" href="https://wordpress.org">Multiple attributes</a>',
+ '<a title="Title" href="https://wordpress.org" rel="nofollow ugc">Multiple attributes</a>',
+ ),
+ array(
+ '<a data-someflag href="https://wordpress.org">Multiple attributes</a>',
+ '<a data-someflag href="https://wordpress.org" rel="nofollow ugc">Multiple attributes</a>',
+ ),
+ array(
+ '<a data-someflag title="Title" href="https://wordpress.org" onclick="" >Everything at once</a>',
+ '<a data-someflag title="Title" href="https://wordpress.org" onclick="" rel="nofollow ugc">Everything at once</a>',
+ ),
+ array(
+ '<a href="' . $home_url_http . '/some-url">Home URL (http)</a>',
+ '<a href="' . $home_url_http . '/some-url">Home URL (http)</a>',
+ ),
+ array(
+ '<a href="' . $home_url_https . '/some-url">Home URL (https)</a>',
+ '<a href="' . $home_url_https . '/some-url">Home URL (https)</a>',
+ ),
+ );
+ }
+
+ public function test_append_ugc_with_valueless_attribute() {
+ $content = '<p>This is some cool <a href="demo.com" download rel="hola">Code</a></p>';
+ $expected = '<p>This is some cool <a href=\"demo.com\" download rel=\"hola nofollow ugc\">Code</a></p>';
+ $this->assertEquals( $expected, wp_rel_ugc( $content ) );
+ }
+}
</ins></span></pre>
</div>
</div>
</body>
</html>