Ticket #48022: 48022.3.diff

src/wp-includes/formatting.php

@@ -2835 +2835 @@
                 return $matches[0];
         }
 
-        return $matches[1] . "<a href=\"$url\" rel=\"nofollow\">$url</a>" . $suffix;
+        return $matches[1] . "<a href=\"$url\" rel=\"nofollow ugc\">$url</a>" . $suffix;
 }
 
 /**

tests/phpunit/tests/formatting/MakeClickable.php

@@ -48 +48 @@
                         'There was a spoon named (http://wordpress.org) said Alice.',
                 );
                 $urls_expected = array(
-                        '<a href="http://wordpress.org/hello.html" rel="nofollow">http://wordpress.org/hello.html</a>',
-                        'There was a spoon named <a href="http://wordpress.org" rel="nofollow">http://wordpress.org</a>. Alice!',
-                        'There was a spoon named <a href="http://wordpress.org" rel="nofollow">http://wordpress.org</a>, said Alice.',
-                        'There was a spoon named <a href="http://wordpress.org" rel="nofollow">http://wordpress.org</a>; said Alice.',
-                        'There was a spoon named <a href="http://wordpress.org" rel="nofollow">http://wordpress.org</a>: said Alice.',
-                        'There was a spoon named (<a href="http://wordpress.org" rel="nofollow">http://wordpress.org</a>) said Alice.',
+                        '<a href="http://wordpress.org/hello.html" rel="nofollow ugc">http://wordpress.org/hello.html</a>',
+                        'There was a spoon named <a href="http://wordpress.org" rel="nofollow ugc">http://wordpress.org</a>. Alice!',
+                        'There was a spoon named <a href="http://wordpress.org" rel="nofollow ugc">http://wordpress.org</a>, said Alice.',
+                        'There was a spoon named <a href="http://wordpress.org" rel="nofollow ugc">http://wordpress.org</a>; said Alice.',
+                        'There was a spoon named <a href="http://wordpress.org" rel="nofollow ugc">http://wordpress.org</a>: said Alice.',
+                        'There was a spoon named (<a href="http://wordpress.org" rel="nofollow ugc">http://wordpress.org</a>) said Alice.',
                 );
 
                 foreach ( $urls_before as $key => $url ) {
@@ -74 +74 @@
                         'There was a spoon named (http://wordpress.org)x',
                 );
                 $urls_expected = array(
-                        '<a href="http://wordpress.org/hello.html" rel="nofollow">http://wordpress.org/hello.html</a>',
-                        'There was a spoon named <a href="http://wordpress.org" rel="nofollow">http://wordpress.org</a>.',
-                        'There was a spoon named <a href="http://wordpress.org" rel="nofollow">http://wordpress.org</a>,',
-                        'There was a spoon named <a href="http://wordpress.org" rel="nofollow">http://wordpress.org</a>;',
-                        'There was a spoon named <a href="http://wordpress.org" rel="nofollow">http://wordpress.org</a>:',
-                        'There was a spoon named (<a href="http://wordpress.org" rel="nofollow">http://wordpress.org</a>)',
-                        'There was a spoon named (<a href="http://wordpress.org" rel="nofollow">http://wordpress.org</a>)x',
+                        '<a href="http://wordpress.org/hello.html" rel=" ugc ugc">http://wordpress.org/hello.html</a>',
+                        'There was a spoon named <a href="http://wordpress.org" rel="nofollow ugc">http://wordpress.org</a>.',
+                        'There was a spoon named <a href="http://wordpress.org" rel="nofollow ugc">http://wordpress.org</a>,',
+                        'There was a spoon named <a href="http://wordpress.org" rel="nofollow ugc">http://wordpress.org</a>;',
+                        'There was a spoon named <a href="http://wordpress.org" rel="nofollow ugc">http://wordpress.org</a>:',
+                        'There was a spoon named (<a href="http://wordpress.org" rel="nofollow ugc">http://wordpress.org</a>)',
+                        'There was a spoon named (<a href="http://wordpress.org" rel="nofollow ugc">http://wordpress.org</a>)x',
                 );
 
                 foreach ( $urls_before as $key => $url ) {
@@ -100 +100 @@
                         'There was a spoon named www.wordpress.org) said Alice.',
                 );
                 $urls_expected = array(
-                        '<a href="http://www.wordpress.org" rel="nofollow">http://www.wordpress.org</a>',
-                        'There was a spoon named <a href="http://www.wordpress.org" rel="nofollow">http://www.wordpress.org</a>. Alice!',
-                        'There was a spoon named <a href="http://www.wordpress.org" rel="nofollow">http://www.wordpress.org</a>, said Alice.',
-                        'There was a spoon named <a href="http://www.wordpress.org" rel="nofollow">http://www.wordpress.org</a>; said Alice.',
-                        'There was a spoon named <a href="http://www.wordpress.org" rel="nofollow">http://www.wordpress.org</a>: said Alice.',
-                        'There was a spoon named <a href="http://www.wordpress.org" rel="nofollow">http://www.wordpress.org</a>) said Alice.',
+                        '<a href="http://www.wordpress.org" rel="nofollow ugc">http://www.wordpress.org</a>',
+                        'There was a spoon named <a href="http://www.wordpress.org" rel="nofollow ugc">http://www.wordpress.org</a>. Alice!',
+                        'There was a spoon named <a href="http://www.wordpress.org" rel="nofollow ugc">http://www.wordpress.org</a>, said Alice.',
+                        'There was a spoon named <a href="http://www.wordpress.org" rel="nofollow ugc">http://www.wordpress.org</a>; said Alice.',
+                        'There was a spoon named <a href="http://www.wordpress.org" rel="nofollow ugc">http://www.wordpress.org</a>: said Alice.',
+                        'There was a spoon named <a href="http://www.wordpress.org" rel="nofollow ugc">http://www.wordpress.org</a>) said Alice.',
                 );
 
                 foreach ( $urls_before as $key => $url ) {
@@ -125 +125 @@
                         'There was a spoon named www.wordpress.org)',
                 );
                 $urls_expected = array(
-                        '<a href="http://www.wordpress.org" rel="nofollow">http://www.wordpress.org</a>',
-                        'There was a spoon named <a href="http://www.wordpress.org" rel="nofollow">http://www.wordpress.org</a>.',
-                        'There was a spoon named <a href="http://www.wordpress.org" rel="nofollow">http://www.wordpress.org</a>,',
-                        'There was a spoon named <a href="http://www.wordpress.org" rel="nofollow">http://www.wordpress.org</a>;',
-                        'There was a spoon named <a href="http://www.wordpress.org" rel="nofollow">http://www.wordpress.org</a>:',
-                        'There was a spoon named <a href="http://www.wordpress.org" rel="nofollow">http://www.wordpress.org</a>)',
+                        '<a href="http://www.wordpress.org" rel="nofollow ugc">http://www.wordpress.org</a>',
+                        'There was a spoon named <a href="http://www.wordpress.org" rel="nofollow ugc">http://www.wordpress.org</a>.',
+                        'There was a spoon named <a href="http://www.wordpress.org" rel="nofollow ugc">http://www.wordpress.org</a>,',
+                        'There was a spoon named <a href="http://www.wordpress.org" rel="nofollow ugc">http://www.wordpress.org</a>;',
+                        'There was a spoon named <a href="http://www.wordpress.org" rel="nofollow ugc">http://www.wordpress.org</a>:',
+                        'There was a spoon named <a href="http://www.wordpress.org" rel="nofollow ugc">http://www.wordpress.org</a>)',
                 );
 
                 foreach ( $urls_before as $key => $url ) {
@@ -146 +146 @@
                         'http://example.com/?a=баба&b=дядо',
                 );
                 $urls_expected = array(
-                        '<a href="http://www.詹姆斯.com/" rel="nofollow">http://www.詹姆斯.com/</a>',
-                        '<a href="http://bg.wikipedia.org/Баба" rel="nofollow">http://bg.wikipedia.org/Баба</a>',
-                        '<a href="http://example.com/?a=баба&#038;b=дядо" rel="nofollow">http://example.com/?a=баба&#038;b=дядо</a>',
+                        '<a href="http://www.詹姆斯.com/" rel="nofollow ugc">http://www.詹姆斯.com/</a>',
+                        '<a href="http://bg.wikipedia.org/Баба" rel="nofollow ugc">http://bg.wikipedia.org/Баба</a>',
+                        '<a href="http://example.com/?a=баба&#038;b=дядо" rel="nofollow ugc">http://example.com/?a=баба&#038;b=дядо</a>',
                 );
                 foreach ( $urls_before as $key => $url ) {
                         $this->assertEquals( $urls_expected[ $key ], make_clickable( $url ) );
@@ -172 +172 @@
                         Richard Hamming wrote about people getting more done with their doors closed, but',
                 );
                 $urls_expected = array(
-                        '<a href="http://en.wikipedia.org/wiki/PC_Tools_(Central_Point_Software)" rel="nofollow">http://en.wikipedia.org/wiki/PC_Tools_(Central_Point_Software)</a>',
-                        '(<a href="http://en.wikipedia.org/wiki/PC_Tools_(Central_Point_Software)" rel="nofollow">http://en.wikipedia.org/wiki/PC_Tools_(Central_Point_Software)</a>)',
-                        'blah <a href="http://en.wikipedia.org/wiki/PC_Tools_(Central_Point_Software)" rel="nofollow">http://en.wikipedia.org/wiki/PC_Tools_(Central_Point_Software)</a> blah',
-                        'blah (<a href="http://en.wikipedia.org/wiki/PC_Tools_(Central_Point_Software)" rel="nofollow">http://en.wikipedia.org/wiki/PC_Tools_(Central_Point_Software)</a>) blah',
-                        'blah blah blah <a href="http://en.wikipedia.org/wiki/PC_Tools_(Central_Point_Software)" rel="nofollow">http://en.wikipedia.org/wiki/PC_Tools_(Central_Point_Software)</a> blah blah',
-                        'blah blah blah <a href="http://en.wikipedia.org/wiki/PC_Tools_(Central_Point_Software)" rel="nofollow">http://en.wikipedia.org/wiki/PC_Tools_(Central_Point_Software)</a>) blah blah',
-                        'blah blah (<a href="http://en.wikipedia.org/wiki/PC_Tools_(Central_Point_Software)" rel="nofollow">http://en.wikipedia.org/wiki/PC_Tools_(Central_Point_Software)</a>) blah blah',
-                        'blah blah <a href="http://en.wikipedia.org/wiki/PC_Tools_(Central_Point_Software)" rel="nofollow">http://en.wikipedia.org/wiki/PC_Tools_(Central_Point_Software)</a>.) blah blah',
-                        'blah blah <a href="http://en.wikipedia.org/wiki/PC_Tools_(Central_Point_Software)" rel="nofollow">http://en.wikipedia.org/wiki/PC_Tools_(Central_Point_Software)</a>.)moreurl blah blah',
+                        '<a href="http://en.wikipedia.org/wiki/PC_Tools_(Central_Point_Software)" rel="nofollow ugc">http://en.wikipedia.org/wiki/PC_Tools_(Central_Point_Software)</a>',
+                        '(<a href="http://en.wikipedia.org/wiki/PC_Tools_(Central_Point_Software)" rel="nofollow ugc">http://en.wikipedia.org/wiki/PC_Tools_(Central_Point_Software)</a>)',
+                        'blah <a href="http://en.wikipedia.org/wiki/PC_Tools_(Central_Point_Software)" rel="nofollow ugc">http://en.wikipedia.org/wiki/PC_Tools_(Central_Point_Software)</a> blah',
+                        'blah (<a href="http://en.wikipedia.org/wiki/PC_Tools_(Central_Point_Software)" rel="nofollow ugc">http://en.wikipedia.org/wiki/PC_Tools_(Central_Point_Software)</a>) blah',
+                        'blah blah blah <a href="http://en.wikipedia.org/wiki/PC_Tools_(Central_Point_Software)" rel="nofollow ugc">http://en.wikipedia.org/wiki/PC_Tools_(Central_Point_Software)</a> blah blah',
+                        'blah blah blah <a href="http://en.wikipedia.org/wiki/PC_Tools_(Central_Point_Software)" rel="nofollow ugc">http://en.wikipedia.org/wiki/PC_Tools_(Central_Point_Software)</a>) blah blah',
+                        'blah blah (<a href="http://en.wikipedia.org/wiki/PC_Tools_(Central_Point_Software)" rel="nofollow ugc">http://en.wikipedia.org/wiki/PC_Tools_(Central_Point_Software)</a>) blah blah',
+                        'blah blah <a href="http://en.wikipedia.org/wiki/PC_Tools_(Central_Point_Software)" rel="nofollow ugc">http://en.wikipedia.org/wiki/PC_Tools_(Central_Point_Software)</a>.) blah blah',
+                        'blah blah <a href="http://en.wikipedia.org/wiki/PC_Tools_(Central_Point_Software)" rel="nofollow ugc">http://en.wikipedia.org/wiki/PC_Tools_(Central_Point_Software)</a>.)moreurl blah blah',
                         'In his famous speech “You and Your research” (here:
-                        <a href="http://www.cs.virginia.edu/~robins/YouAndYourResearch.html" rel="nofollow">http://www.cs.virginia.edu/~robins/YouAndYourResearch.html</a>)
+                        <a href="http://www.cs.virginia.edu/~robins/YouAndYourResearch.html" rel="nofollow ugc">http://www.cs.virginia.edu/~robins/YouAndYourResearch.html</a>)
                         Richard Hamming wrote about people getting more done with their doors closed, but',
                 );
                 foreach ( $urls_before as $key => $url ) {
@@ -199 +199 @@
                         'In his famous speech “You and Your research” (here: http://www.cs.virginia.edu/~robins/YouAndYourResearch.html) Richard Hamming wrote about people getting more done with their doors closed...',
                 );
                 $urls_expected = array(
-                        'Example: WordPress, test (some text), I love example.com (<a href="http://example.org" rel="nofollow">http://example.org</a>), it is brilliant',
-                        'Example: WordPress, test (some text), I love example.com (<a href="http://example.com" rel="nofollow">http://example.com</a>), it is brilliant',
-                        'Some text followed by a bracketed link with a trailing elipsis (<a href="http://example.com" rel="nofollow">http://example.com</a>)...',
-                        'In his famous speech “You and Your research” (here: <a href="http://www.cs.virginia.edu/~robins/YouAndYourResearch.html" rel="nofollow">http://www.cs.virginia.edu/~robins/YouAndYourResearch.html</a>) Richard Hamming wrote about people getting more done with their doors closed...',
+                        'Example: WordPress, test (some text), I love example.com (<a href="http://example.org" rel="nofollow ugc">http://example.org</a>), it is brilliant',
+                        'Example: WordPress, test (some text), I love example.com (<a href="http://example.com" rel="nofollow ugc">http://example.com</a>), it is brilliant',
+                        'Some text followed by a bracketed link with a trailing elipsis (<a href="http://example.com" rel="nofollow ugc">http://example.com</a>)...',
+                        'In his famous speech “You and Your research” (here: <a href="http://www.cs.virginia.edu/~robins/YouAndYourResearch.html" rel="nofollow ugc">http://www.cs.virginia.edu/~robins/YouAndYourResearch.html</a>) Richard Hamming wrote about people getting more done with their doors closed...',
                 );
                 foreach ( $urls_before as $key => $url ) {
                         $this->assertEquals( $urls_expected[ $key ], make_clickable( $url ) );
@@ -217 +217 @@
                         'This is a really good tweet http://twitter.com/#!/wordpress/status/25907440233!',
                 );
                 $urls_expected = array(
-                        '<a href="http://twitter.com/#!/wordpress/status/25907440233" rel="nofollow">http://twitter.com/#!/wordpress/status/25907440233</a>',
-                        'This is a really good tweet <a href="http://twitter.com/#!/wordpress/status/25907440233" rel="nofollow">http://twitter.com/#!/wordpress/status/25907440233</a> !',
-                        'This is a really good tweet <a href="http://twitter.com/#!/wordpress/status/25907440233" rel="nofollow">http://twitter.com/#!/wordpress/status/25907440233</a>!',
+                        '<a href="http://twitter.com/#!/wordpress/status/25907440233" rel="nofollow ugc">http://twitter.com/#!/wordpress/status/25907440233</a>',
+                        'This is a really good tweet <a href="http://twitter.com/#!/wordpress/status/25907440233" rel="nofollow ugc">http://twitter.com/#!/wordpress/status/25907440233</a> !',
+                        'This is a really good tweet <a href="http://twitter.com/#!/wordpress/status/25907440233" rel="nofollow ugc">http://twitter.com/#!/wordpress/status/25907440233</a>!',
                 );
                 foreach ( $urls_before as $key => $url ) {
                         $this->assertEquals( $urls_expected[ $key ], make_clickable( $url ) );
@@ -233 +233 @@
                         'mailto wrapped in angle brackets <foo@example.com>',
                 );
                 $expected = array(
-                        'URL wrapped in angle brackets <<a href="http://example.com/" rel="nofollow">http://example.com/</a>>',
-                        'URL wrapped in angle brackets with padding < <a href="http://example.com/" rel="nofollow">http://example.com/</a> >',
+                        'URL wrapped in angle brackets <<a href="http://example.com/" rel="nofollow ugc">http://example.com/</a>>',
+                        'URL wrapped in angle brackets with padding < <a href="http://example.com/" rel="nofollow ugc">http://example.com/</a> >',
                         'mailto wrapped in angle brackets <foo@example.com>',
                 );
                 foreach ( $before as $key => $url ) {
@@ -252 +252 @@
                         'Question mark then URL?http://example.com/',
                 );
                 $expected = array(
-                        'Comma then URL,<a href="http://example.com/" rel="nofollow">http://example.com/</a>',
-                        'Period then URL.<a href="http://example.com/" rel="nofollow">http://example.com/</a>',
-                        'Semi-colon then URL;<a href="http://example.com/" rel="nofollow">http://example.com/</a>',
-                        'Colon then URL:<a href="http://example.com/" rel="nofollow">http://example.com/</a>',
-                        'Exclamation mark then URL!<a href="http://example.com/" rel="nofollow">http://example.com/</a>',
-                        'Question mark then URL?<a href="http://example.com/" rel="nofollow">http://example.com/</a>',
+                        'Comma then URL,<a href="http://example.com/" rel="nofollow ugc">http://example.com/</a>',
+                        'Period then URL.<a href="http://example.com/" rel="nofollow ugc">http://example.com/</a>',
+                        'Semi-colon then URL;<a href="http://example.com/" rel="nofollow ugc">http://example.com/</a>',
+                        'Colon then URL:<a href="http://example.com/" rel="nofollow ugc">http://example.com/</a>',
+                        'Exclamation mark then URL!<a href="http://example.com/" rel="nofollow ugc">http://example.com/</a>',
+                        'Question mark then URL?<a href="http://example.com/" rel="nofollow ugc">http://example.com/</a>',
                 );
                 foreach ( $before as $key => $url ) {
                         $this->assertEquals( $expected[ $key ], make_clickable( $url ) );
@@ -277 +277 @@
                 $urls_expected = array(
                         "<img src='http://trunk.domain/wp-includes/images/smilies/icon_smile.gif' alt=':)' class='wp-smiley'>",
                         "(<img src='http://trunk.domain/wp-includes/images/smilies/icon_smile.gif' alt=':)' class='wp-smiley'>)",
-                        "<a href=\"http://trunk.domain/testing#something\" rel=\"nofollow\">http://trunk.domain/testing#something</a> (<img src='http://trunk.domain/wp-includes/images/smilies/icon_smile.gif' alt=':)' class='wp-smiley'>)",
-                        "<a href=\"http://trunk.domain/testing#something\" rel=\"nofollow\">http://trunk.domain/testing#something</a>
+                        "<a href=\"http://trunk.domain/testing#something\" rel=\" ugc\">http://trunk.domain/testing#something</a> (<img src='http://trunk.domain/wp-includes/images/smilies/icon_smile.gif' alt=':)' class='wp-smiley'>)",
+                        "<a href=\"http://trunk.domain/testing#something\" rel=\" ugc\">http://trunk.domain/testing#something</a>
                         (<img src='http://trunk.domain/wp-includes/images/smilies/icon_smile.gif' alt=':)' class='wp-smiley'>)",
                         "<span style='text-align:center; display: block;'><object width='425' height='350'><param name='movie' value='http://www.youtube.com/v/nd_BdvG43rE&rel=1&fs=1&showsearch=0&showinfo=1&iv_load_policy=1' /> <param name='allowfullscreen' value='true' /> <param name='wmode' value='opaque' /> <embed src='http://www.youtube.com/v/nd_BdvG43rE&rel=1&fs=1&showsearch=0&showinfo=1&iv_load_policy=1' type='application/x-shockwave-flash' allowfullscreen='true' width='425' height='350' wmode='opaque'></embed> </object></span>",
                         '<a href="http://example.com/example.gif" title="Image from http://example.com">Look at this image!</a>',
@@ -313 +313 @@
                         '<code>http://wordpress.org</code>',
                         '<pre class="foobar" id="foo">http://wordpress.org</pre>',
                         '<code class="foobar" id="foo">http://wordpress.org</code>',
-                        '<precustomtag><a href="http://wordpress.org" rel="nofollow">http://wordpress.org</a></precustomtag>',
-                        '<codecustomtag><a href="http://wordpress.org" rel="nofollow">http://wordpress.org</a></codecustomtag>',
-                        'URL before pre <a href="http://wordpress.org" rel="nofollow">http://wordpress.org</a><pre>http://wordpress.org</pre>',
-                        'URL before code <a href="http://wordpress.org" rel="nofollow">http://wordpress.org</a><code>http://wordpress.org</code>',
-                        'URL after pre <PRE>http://wordpress.org</PRE><a href="http://wordpress.org" rel="nofollow">http://wordpress.org</a>',
-                        'URL after code <code>http://wordpress.org</code><a href="http://wordpress.org" rel="nofollow">http://wordpress.org</a>',
-                        'URL before and after pre <a href="http://wordpress.org" rel="nofollow">http://wordpress.org</a><pre>http://wordpress.org</pre><a href="http://wordpress.org" rel="nofollow">http://wordpress.org</a>',
-                        'URL before and after code <a href="http://wordpress.org" rel="nofollow">http://wordpress.org</a><code>http://wordpress.org</code><a href="http://wordpress.org" rel="nofollow">http://wordpress.org</a>',
+                        '<precustomtag><a href="http://wordpress.org" rel="nofollow ugc">http://wordpress.org</a></precustomtag>',
+                        '<codecustomtag><a href="http://wordpress.org" rel="nofollow ugc">http://wordpress.org</a></codecustomtag>',
+                        'URL before pre <a href="http://wordpress.org" rel="nofollow ugc">http://wordpress.org</a><pre>http://wordpress.org</pre>',
+                        'URL before code <a href="http://wordpress.org" rel="nofollow ugc">http://wordpress.org</a><code>http://wordpress.org</code>',
+                        'URL after pre <PRE>http://wordpress.org</PRE><a href="http://wordpress.org" rel="nofollow ugc">http://wordpress.org</a>',
+                        'URL after code <code>http://wordpress.org</code><a href="http://wordpress.org" rel="nofollow ugc">http://wordpress.org</a>',
+                        'URL before and after pre <a href="http://wordpress.org" rel="nofollow ugc">http://wordpress.org</a><pre>http://wordpress.org</pre><a href="http://wordpress.org" rel="nofollow ugc">http://wordpress.org</a>',
+                        'URL before and after code <a href="http://wordpress.org" rel="nofollow ugc">http://wordpress.org</a><code>http://wordpress.org</code><a href="http://wordpress.org" rel="nofollow ugc">http://wordpress.org</a>',
                         'code inside pre <pre>http://wordpress.org <code>http://wordpress.org</code> http://wordpress.org</pre>',
                 );
 
@@ -338 +338 @@
                         '<p>http://example.com/</p>',
                 );
                 $urls_expected = array(
-                        '<span><a href="http://example.com" rel="nofollow">http://example.com</a></span>',
-                        '<p><a href="http://example.com/" rel="nofollow">http://example.com/</a></p>',
+                        '<span><a href="http://example.com" rel="nofollow ugc">http://example.com</a></span>',
+                        '<p><a href="http://example.com/" rel="nofollow ugc">http://example.com/</a></p>',
                 );
                 foreach ( $urls_before as $key => $url ) {
                         $this->assertEquals( $urls_expected[ $key ], make_clickable( $url ) );