Changeset 34042

Timestamp:

09/11/2015 06:20:56 AM (11 years ago)

Author:

wonderboymusic

Message:

After [33961], pass $comment to get_comment_link() where possible to avoid extra cache/db lookups.

See #33638.

Location:

trunk/src

Files:

• wp-admin/comment.php (modified) (1 diff)
• wp-admin/edit-form-comment.php (modified) (2 diffs)
• wp-comments-post.php (modified) (1 diff)
• wp-includes/class-walker-comment.php (modified) (3 diffs)
• wp-includes/link-template.php (modified) (2 diffs)
• wp-includes/pluggable.php (modified) (1 diff)
• wp-includes/widgets/class-wp-widget-recent-comments.php (modified) (1 diff)

trunk/src/wp-admin/comment.php

@@ -194 +194 @@
                 /* translators: 2: comment date, 3: comment time */
                 printf( __( '<a href="%1$s">%2$s at %3$s</a>' ),
-                        esc_url( get_comment_link( $comment->comment_ID ) ),
+                        esc_url( get_comment_link( $comment ) ),
                         /* translators: comment date format. See http://php.net/date */
                         get_comment_date( __( 'Y/m/d' ), $comment ),

trunk/src/wp-admin/edit-form-comment.php

@@ -70 +70 @@
 <div id="minor-publishing-actions">
 <div id="preview-action">
-<a class="preview button" href="<?php echo get_comment_link(); ?>" target="_blank"><?php _e('View Comment'); ?></a>
+<a class="preview button" href="<?php echo get_comment_link( $comment ); ?>" target="_blank"><?php _e('View Comment'); ?></a>
 </div>
 <div class="clear"></div>
@@ -121 +121 @@
         $parent      = get_comment( $comment->comment_parent );
         if ( $parent ) :
-                $parent_link = esc_url( get_comment_link( $comment->comment_parent ) );
+                $parent_link = esc_url( get_comment_link( $comment ) );
                 $name        = get_comment_author( $parent );
         ?>

trunk/src/wp-comments-post.php

@@ -152 +152 @@
 do_action( 'set_comment_cookies', $comment, $user );
 
-$location = empty($_POST['redirect_to']) ? get_comment_link($comment_id) : $_POST['redirect_to'] . '#comment-' . $comment_id;
+$location = empty($_POST['redirect_to']) ? get_comment_link( $comment ) : $_POST['redirect_to'] . '#comment-' . $comment_id;
 
 /**

trunk/src/wp-includes/class-walker-comment.php

@@ -230 +230 @@
                 <<?php echo $tag; ?> id="comment-<?php comment_ID(); ?>" <?php comment_class( '', $comment ); ?>>
                         <div class="comment-body">
-                                <?php _e( 'Pingback:' ); ?> <?php comment_author_link(); ?> <?php edit_comment_link( __( 'Edit' ), '<span class="edit-link">', '</span>' ); ?>
+                                <?php _e( 'Pingback:' ); ?> <?php comment_author_link( $comment ); ?> <?php edit_comment_link( __( 'Edit' ), '<span class="edit-link">', '</span>' ); ?>
                         </div>
 <?php
@@ -269 +269 @@
                 <?php endif; ?>
 
-                <div class="comment-meta commentmetadata"><a href="<?php echo esc_url( get_comment_link( $comment->comment_ID, $args ) ); ?>">
+                <div class="comment-meta commentmetadata"><a href="<?php echo esc_url( get_comment_link( $comment, $args ) ); ?>">
                         <?php
                                 /* translators: 1: comment date, 2: comment time */
@@ -318 +318 @@
 
                                         <div class="comment-metadata">
-                                                <a href="<?php echo esc_url( get_comment_link( $comment->comment_ID, $args ) ); ?>">
+                                                <a href="<?php echo esc_url( get_comment_link( $comment, $args ) ); ?>">
                                                         <time datetime="<?php comment_time( 'c' ); ?>">
                                                                 <?php

trunk/src/wp-includes/link-template.php

@@ -1286 +1286 @@
  * @since 2.3.0
  *
- * @param int $comment_id Optional. Comment ID.
+ * @param int|WP_Comment $comment_id Optional. Comment ID or WP_Comment object.
  * @return string|void The edit comment link URL for the given comment.
  */
@@ -1327 +1327 @@
         }
 
-        $link = '<a class="comment-edit-link" href="' . get_edit_comment_link( $comment->comment_ID ) . '">' . $text . '</a>';
+        $link = '<a class="comment-edit-link" href="' . get_edit_comment_link( $comment ) . '">' . $text . '</a>';
 
         /**

trunk/src/wp-includes/pluggable.php

@@ -1473 +1473 @@
         }
         $notify_message .= get_permalink($comment->comment_post_ID) . "#comments\r\n\r\n";
-        $notify_message .= sprintf( __('Permalink: %s'), get_comment_link( $comment_id ) ) . "\r\n";
+        $notify_message .= sprintf( __('Permalink: %s'), get_comment_link( $comment ) ) . "\r\n";
 
         if ( user_can( $post->post_author, 'edit_comment', $comment_id ) ) {

trunk/src/wp-includes/widgets/class-wp-widget-recent-comments.php

@@ -112 +112 @@
                                 $output .= sprintf( _x( '%1$s on %2$s', 'widgets' ),
                                         '<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>'
+                                        '<a href="' . esc_url( get_comment_link( $comment ) ) . '">' . get_the_title( $comment->comment_post_ID ) . '</a>'
                                 );
                                 $output .= '</li>';