From db702bc3ea62f0f9625a31b5cb7c7351248a3466 Mon Sep 17 00:00:00 2001
From: Scott Taylor <wonderboymusic@git.wordpress.org>
Date: Fri, 11 Sep 2015 06:04:22 +0000
Subject: [PATCH] After [33961], pass `$comment` to `get_comment_author_link()`
 where possible to avoid extra cache/db lookups.

See #33638.


git-svn-id: https://develop.svn.wordpress.org/trunk@34039 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/comment.php                                    | 4 ++--
 src/wp-admin/edit-form-comment.php                          | 2 +-
 src/wp-includes/class-walker-comment.php                    | 4 ++--
 src/wp-includes/comment-template.php                        | 2 +-
 src/wp-includes/theme-compat/comments-popup.php             | 2 +-
 src/wp-includes/widgets/class-wp-widget-recent-comments.php | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/wp-admin/comment.php b/src/wp-admin/comment.php
index ab0235218c..7e86f03cb0 100644
--- a/src/wp-admin/comment.php
+++ b/src/wp-admin/comment.php
@@ -180,8 +180,8 @@ if ( $comment->comment_approved != '0' ) { // if not unapproved
 
 		if ( $comment->comment_parent ) {
 			$parent      = get_comment( $comment->comment_parent );
-			$parent_link = esc_url( get_comment_link( $comment->comment_parent ) );
-			$name        = get_comment_author( $parent->comment_ID );
+			$parent_link = esc_url( get_comment_link( $parent ) );
+			$name        = get_comment_author( $parent );
 			printf( ' | ' . __( 'In reply to <a href="%1$s">%2$s</a>.' ), $parent_link, $name );
 		}
 	?>
diff --git a/src/wp-admin/edit-form-comment.php b/src/wp-admin/edit-form-comment.php
index dda2615134..fe49043927 100644
--- a/src/wp-admin/edit-form-comment.php
+++ b/src/wp-admin/edit-form-comment.php
@@ -121,7 +121,7 @@ if ( $comment->comment_parent ) :
 	$parent      = get_comment( $comment->comment_parent );
 	if ( $parent ) :
 		$parent_link = esc_url( get_comment_link( $comment->comment_parent ) );
-		$name        = get_comment_author( $parent->comment_ID );
+		$name        = get_comment_author( $parent );
 	?>
 	<div class="misc-pub-section misc-pub-reply-to">
 		<?php printf(
diff --git a/src/wp-includes/class-walker-comment.php b/src/wp-includes/class-walker-comment.php
index e3f20ea453..4d10278c9d 100644
--- a/src/wp-includes/class-walker-comment.php
+++ b/src/wp-includes/class-walker-comment.php
@@ -261,7 +261,7 @@ class Walker_Comment extends Walker {
 		<?php endif; ?>
 		<div class="comment-author vcard">
 			<?php if ( 0 != $args['avatar_size'] ) echo get_avatar( $comment, $args['avatar_size'] ); ?>
-			<?php printf( __( '<cite class="fn">%s</cite> <span class="says">says:</span>' ), get_comment_author_link() ); ?>
+			<?php printf( __( '<cite class="fn">%s</cite> <span class="says">says:</span>' ), get_comment_author_link( $comment ) ); ?>
 		</div>
 		<?php if ( '0' == $comment->comment_approved ) : ?>
 		<em class="comment-awaiting-moderation"><?php _e( 'Your comment is awaiting moderation.' ) ?></em>
@@ -313,7 +313,7 @@ class Walker_Comment extends Walker {
 				<footer class="comment-meta">
 					<div class="comment-author vcard">
 						<?php if ( 0 != $args['avatar_size'] ) echo get_avatar( $comment, $args['avatar_size'] ); ?>
-						<?php printf( __( '%s <span class="says">says:</span>' ), sprintf( '<b class="fn">%s</b>', get_comment_author_link() ) ); ?>
+						<?php printf( __( '%s <span class="says">says:</span>' ), sprintf( '<b class="fn">%s</b>', get_comment_author_link( $comment ) ) ); ?>
 					</div><!-- .comment-author -->
 
 					<div class="comment-metadata">
diff --git a/src/wp-includes/comment-template.php b/src/wp-includes/comment-template.php
index dd9971e476..f81d6000bb 100644
--- a/src/wp-includes/comment-template.php
+++ b/src/wp-includes/comment-template.php
@@ -1672,7 +1672,7 @@ function comment_form_title( $noreplytext = false, $replytext = false, $linktopa
 		echo $noreplytext;
 	else {
 		$comment = get_comment($replytoid);
-		$author = ( $linktoparent ) ? '<a href="#comment-' . get_comment_ID() . '">' . get_comment_author() . '</a>' : get_comment_author();
+		$author = ( $linktoparent ) ? '<a href="#comment-' . get_comment_ID() . '">' . get_comment_author( $comment ) . '</a>' : get_comment_author( $comment );
 		printf( $replytext, $author );
 	}
 }
diff --git a/src/wp-includes/theme-compat/comments-popup.php b/src/wp-includes/theme-compat/comments-popup.php
index 8accfb7f4c..bd7a5db71a 100644
--- a/src/wp-includes/theme-compat/comments-popup.php
+++ b/src/wp-includes/theme-compat/comments-popup.php
@@ -52,7 +52,7 @@ if ( post_password_required($post) ) {  // and it doesn't match the cookie
 <?php foreach ($comments as $comment) { ?>
 	<li id="comment-<?php comment_ID() ?>">
 	<?php comment_text() ?>
-	<p><cite><?php comment_type(); ?> <?php printf(__('by %1$s &#8212; %2$s @ <a href="#comment-%3$s">%4$s</a>'), get_comment_author_link(), get_comment_date(), get_comment_ID(), get_comment_time()); ?></cite></p>
+	<p><cite><?php comment_type(); ?> <?php printf(__('by %1$s &#8212; %2$s @ <a href="#comment-%3$s">%4$s</a>'), get_comment_author_link( $comment ), get_comment_date(), get_comment_ID(), get_comment_time()); ?></cite></p>
 	</li>
 
 <?php } // end for each comment ?>
diff --git a/src/wp-includes/widgets/class-wp-widget-recent-comments.php b/src/wp-includes/widgets/class-wp-widget-recent-comments.php
index 0760516efa..8fca91fe18 100644
--- a/src/wp-includes/widgets/class-wp-widget-recent-comments.php
+++ b/src/wp-includes/widgets/class-wp-widget-recent-comments.php
@@ -110,7 +110,7 @@ class WP_Widget_Recent_Comments extends WP_Widget {
 				$output .= '<li class="recentcomments">';
 				/* translators: comments widget: 1: comment author, 2: post link */
 				$output .= sprintf( _x( '%1$s on %2$s', 'widgets' ),
-					'<span class="comment-author-link">' . get_comment_author_link( $comment->comment_ID ) . '</span>',
+					'<span class="comment-author-link">' . get_comment_author_link( $comment ) . '</span>',
 					'<a href="' . esc_url( get_comment_link( $comment->comment_ID ) ) . '">' . get_the_title( $comment->comment_post_ID ) . '</a>'
 				);
 				$output .= '</li>';