<!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>[37305] trunk: Comments: add a `$comment` parameter to `get_comment_author_url_link()`. </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 { 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/37305">37305</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/37305","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>wonderboymusic</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-04-22 22:44:33 +0000 (Fri, 22 Apr 2016)</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 a `$comment` parameter to `get_comment_author_url_link()`.
Add unit tests (none exist).
Props flixos90, wonderboymusic.
Fixes <a href="https://core.trac.wordpress.org/ticket/36573">#36573</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludescommenttemplatephp">trunk/src/wp-includes/comment-template.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestscommentgetCommentAuthorUrlLinkphp">trunk/tests/phpunit/tests/comment/getCommentAuthorUrlLink.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 2016-04-22 21:46:06 UTC (rev 37304)
+++ trunk/src/wp-includes/comment-template.php 2016-04-22 22:44:33 UTC (rev 37305)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -293,8 +293,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_comment_author_url( $comment_ID = 0 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $comment = get_comment( $comment_ID );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $url = ('http://' == $comment->comment_author_url) ? '' : $comment->comment_author_url;
- $url = esc_url( $url, array('http', 'https') );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $url = '';
+ $id = 0;
+ if ( ! empty( $comment ) ) {
+ $author_url = ( 'http://' == $comment->comment_author_url ) ? '' : $comment->comment_author_url;
+ $url = esc_url( $author_url, array( 'http', 'https' ) );
+ $id = $comment->ID;
+ }
</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"> * Filter the comment author's URL.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -306,7 +311,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $comment_ID The comment ID.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param WP_Comment $comment The comment object.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return apply_filters( 'get_comment_author_url', $url, $comment->comment_ID, $comment );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return apply_filters( 'get_comment_author_url', $url, $id, $comment );
</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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -345,17 +350,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * in the order of $before, link, and finally $after.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.5.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 4.6.0 The `$comment` parameter was added.
</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 $linktext Optional. The text to display instead of the comment
- * author's email address. Default empty.
- * @param string $before Optional. The text or HTML to display before the email link.
- * Default empty.
- * @param string $after Optional. The text or HTML to display after the email link.
- * Default empty.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $linktext Optional. The text to display instead of the comment
+ * author's email address. Default empty.
+ * @param string $before Optional. The text or HTML to display before the email link.
+ * Default empty.
+ * @param string $after Optional. The text or HTML to display after the email link.
+ * Default empty.
+ * @param int|WP_Comment $comment Optional. Comment ID or WP_Comment object.
+ * Default is the current comment.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return string The HTML link between the $before and $after parameters.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function get_comment_author_url_link( $linktext = '', $before = '', $after = '' ) {
- $url = get_comment_author_url();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function get_comment_author_url_link( $linktext = '', $before = '', $after = '', $comment = 0 ) {
+ $url = get_comment_author_url( $comment );
</ins><span class="cx" style="display: block; padding: 0 10px"> $display = ($linktext != '') ? $linktext : $url;
</span><span class="cx" style="display: block; padding: 0 10px"> $display = str_replace( 'http://www.', '', $display );
</span><span class="cx" style="display: block; padding: 0 10px"> $display = str_replace( 'http://', '', $display );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -380,16 +388,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Displays the HTML link of the url of the author of the current comment.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 0.71
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 4.6.0 The `$comment` parameter was added.
</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 $linktext Optional. Text to display instead of the comment author's
- * email address. Default empty.
- * @param string $before Optional. Text or HTML to display before the email link.
- * Default empty.
- * @param string $after Optional. Text or HTML to display after the email link.
- * Default empty.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $linktext Optional. Text to display instead of the comment author's
+ * email address. Default empty.
+ * @param string $before Optional. Text or HTML to display before the email link.
+ * Default empty.
+ * @param string $after Optional. Text or HTML to display after the email link.
+ * Default empty.
+ * @param int|WP_Comment $comment Optional. Comment ID or WP_Comment object.
+ * Default is the current comment.
</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 comment_author_url_link( $linktext = '', $before = '', $after = '' ) {
- echo get_comment_author_url_link( $linktext, $before, $after );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function comment_author_url_link( $linktext = '', $before = '', $after = '', $comment = 0 ) {
+ echo get_comment_author_url_link( $linktext, $before, $after, $comment );
</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="trunktestsphpunittestscommentgetCommentAuthorUrlLinkphp"></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/comment/getCommentAuthorUrlLink.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/comment/getCommentAuthorUrlLink.php (rev 0)
+++ trunk/tests/phpunit/tests/comment/getCommentAuthorUrlLink.php 2016-04-22 22:44:33 UTC (rev 37305)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,86 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * @group comment
+ */
+class Tests_Comment_GetCommentAuthorUrlLink extends WP_UnitTestCase {
+ protected static $comments = array();
+
+ public static function wpSetUpBeforeClass( $factory ) {
+ unset( $GLOBALS['comment'] );
+
+ $comment_ids = $factory->comment->create_post_comments( 0, 1 );
+ self::$comments = array_map( 'get_comment', $comment_ids );
+ }
+
+ public static function wpTearDownAfterClass() {
+ foreach ( self::$comments as $comment ) {
+ wp_delete_comment( $comment, true );
+ }
+ }
+
+ protected function parseCommentAuthorUrl( $comment, $linktext = '' ) {
+ if ( empty( $linktext ) ) {
+ $linktext = rtrim( preg_replace( '#http://(www\.)?#', '', $comment->comment_author_url ), '/' );
+ }
+ return sprintf(
+ '<a href=\'%s\' rel=\'external\'>%s</a>',
+ $comment->comment_author_url,
+ $linktext
+ );
+ }
+
+ public function test_no_comment() {
+ $url_link = get_comment_author_url_link();
+
+ $this->assertEquals( "<a href='' rel='external'></a>", $url_link );
+ }
+
+ public function test_global_comment() {
+ $GLOBALS['comment'] = $comment = reset( self::$comments );
+
+ $url_link = get_comment_author_url_link();
+ $link = $this->parseCommentAuthorUrl( $comment );
+ $this->assertEquals( $link, $url_link );
+ }
+
+ public function test_comment_arg() {
+ $comment = reset( self::$comments );
+
+ $url_link = get_comment_author_url_link( '', '', '', $comment );
+ $link = $this->parseCommentAuthorUrl( $comment );
+ $this->assertEquals( $link, $url_link );
+ }
+
+ public function test_linktext() {
+ $comment = reset( self::$comments );
+
+ $url_link = get_comment_author_url_link( 'Burrito', '', '', $comment );
+ $link = $this->parseCommentAuthorUrl( $comment, 'Burrito' );
+ $this->assertEquals( $link, $url_link );
+ }
+
+ public function test_before() {
+ $comment = reset( self::$comments );
+
+ $url_link = get_comment_author_url_link( 'Burrito', 'I would love a ', '', $comment );
+ $link = 'I would love a ' . $this->parseCommentAuthorUrl( $comment, 'Burrito' );
+ $this->assertEquals( $link, $url_link );
+ }
+
+ public function test_after() {
+ $comment = reset( self::$comments );
+
+ $url_link = get_comment_author_url_link( 'Burrito', '', ' is my favorite word.', $comment );
+ $link = $this->parseCommentAuthorUrl( $comment, 'Burrito' ) . ' is my favorite word.';
+ $this->assertEquals( $link, $url_link );
+ }
+
+ public function test_before_after() {
+ $comment = reset( self::$comments );
+
+ $url_link = get_comment_author_url_link( 'Burrito', 'I would love a ', ' right now.', $comment );
+ $link = 'I would love a ' . $this->parseCommentAuthorUrl( $comment, 'Burrito' ) . ' right now.';
+ $this->assertEquals( $link, $url_link );
+ }
+}
</ins></span></pre>
</div>
</div>
</body>
</html>