WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

In `WP_Comments_List_Table`, favor passing `WP_Comment` instances instead of `$comment_ID` to template functions. This allows us to bypass unnecessary cache lookups and simply pass the object through when it is set. 

See #33638.

Built from https://develop.svn.wordpress.org/trunk@33964


git-svn-id: http://core.svn.wordpress.org/trunk@33933 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Scott Taylor 2015-09-09 03:00:24 +00:00
parent d973339738
commit 71f955dc84
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
wp-admin/includes/class-wp-comments-list-table.php
View File

@ -442,11 +442,11 @@ class WP_Comments_List_Table extends WP_List_Table {
public function single_row( $comment ) { public function single_row( $comment ) {
global $post; global $post;
$the_comment_class = wp_get_comment_status( $comment->comment_ID ); $the_comment_class = wp_get_comment_status( $comment );
if ( ! $the_comment_class ) { if ( ! $the_comment_class ) {
$the_comment_class = ''; $the_comment_class = '';
} }
$the_comment_class = join( ' ', get_comment_class( $the_comment_class, $comment->comment_ID, $comment->comment_post_ID ) ); $the_comment_class = join( ' ', get_comment_class( $the_comment_class, $comment, $comment->comment_post_ID ) );
$post = get_post( $comment->comment_post_ID ); $post = get_post( $comment->comment_post_ID );
@ -479,7 +479,7 @@ class WP_Comments_List_Table extends WP_List_Table {
return; return;
} }
$the_comment_status = wp_get_comment_status( $comment->comment_ID ); $the_comment_status = wp_get_comment_status( $comment );
$out = ''; $out = '';
@ -588,7 +588,7 @@ class WP_Comments_List_Table extends WP_List_Table {
* @param object $comment * @param object $comment
*/ */
public function column_comment( $comment ) { public function column_comment( $comment ) {
$comment_url = esc_url( get_comment_link( $comment->comment_ID ) ); $comment_url = esc_url( get_comment_link( $comment ) );
echo '<div class="comment-author">'; echo '<div class="comment-author">';
$this->column_author( $comment ); $this->column_author( $comment );
@ -598,19 +598,19 @@ class WP_Comments_List_Table extends WP_List_Table {
/* translators: 2: comment date, 3: comment time */ /* translators: 2: comment date, 3: comment time */
printf( __( 'Submitted on <a href="%1$s">%2$s at %3$s</a>' ), $comment_url, printf( __( 'Submitted on <a href="%1$s">%2$s at %3$s</a>' ), $comment_url,
/* translators: comment date format. See http://php.net/date */ /* translators: comment date format. See http://php.net/date */
get_comment_date( __( 'Y/m/d' ), $comment->comment_ID ), get_comment_date( __( 'Y/m/d' ), $comment ),
get_comment_date( get_option( 'time_format' ), $comment->comment_ID ) get_comment_date( get_option( 'time_format' ), $comment )
); );
if ( $comment->comment_parent ) { if ( $comment->comment_parent ) {
$parent = get_comment( $comment->comment_parent ); $parent = get_comment( $comment->comment_parent );
$parent_link = esc_url( get_comment_link( $comment->comment_parent ) ); $parent_link = esc_url( get_comment_link( $parent ) );
$name = get_comment_author( $parent->comment_ID ); $name = get_comment_author( $parent );
printf( ' | '.__( 'In reply to <a href="%1$s">%2$s</a>.' ), $parent_link, $name ); printf( ' | '.__( 'In reply to <a href="%1$s">%2$s</a>.' ), $parent_link, $name );
} }
echo '</div>'; echo '</div>';
comment_text( $comment->comment_ID ); comment_text( $comment );
if ( $this->user_can ) { ?> if ( $this->user_can ) { ?>
<div id="inline-<?php echo $comment->comment_ID; ?>" class="hidden"> <div id="inline-<?php echo $comment->comment_ID; ?>" class="hidden">
<textarea class="comment" rows="1" cols="1"><?php <textarea class="comment" rows="1" cols="1"><?php
@ -635,14 +635,14 @@ class WP_Comments_List_Table extends WP_List_Table {
public function column_author( $comment ) { public function column_author( $comment ) {
global $comment_status; global $comment_status;
$author_url = get_comment_author_url( $comment->comment_ID ); $author_url = get_comment_author_url( $comment );
$author_url_display = untrailingslashit( preg_replace( '|^http(s)?://(www\.)?|i', '', $author_url ) ); $author_url_display = untrailingslashit( preg_replace( '|^http(s)?://(www\.)?|i', '', $author_url ) );
if ( strlen( $author_url_display ) > 50 ) { if ( strlen( $author_url_display ) > 50 ) {
$author_url_display = wp_html_excerpt( $author_url_display, 49, '&hellip;' ); $author_url_display = wp_html_excerpt( $author_url_display, 49, '&hellip;' );
} }
echo "<strong>"; comment_author( $comment->comment_ID ); echo '</strong><br />'; echo "<strong>"; comment_author( $comment ); echo '</strong><br />';
if ( ! empty( $author_url_display ) ) { if ( ! empty( $author_url_display ) ) {
printf( '<a href="%s">%s</a><br />', esc_url( $author_url ), esc_html( $author_url_display ) ); printf( '<a href="%s">%s</a><br />', esc_url( $author_url ), esc_html( $author_url_display ) );
} }
@ -657,7 +657,7 @@ class WP_Comments_List_Table extends WP_List_Table {
} }
} }
$author_ip = get_comment_author_IP( $comment->comment_ID ); $author_ip = get_comment_author_IP( $comment );
if ( $author_ip ) { if ( $author_ip ) {
$author_ip_url = add_query_arg( array( 's' => $author_ip, 'mode' => 'detail' ), 'edit-comments.php' ); $author_ip_url = add_query_arg( array( 's' => $author_ip, 'mode' => 'detail' ), 'edit-comments.php' );
if ( 'spam' == $comment_status ) { if ( 'spam' == $comment_status ) {
@ -673,7 +673,7 @@ class WP_Comments_List_Table extends WP_List_Table {
* @return string * @return string
*/ */
public function column_date( $comment ) { public function column_date( $comment ) {
return get_comment_date( __( 'Y/m/d \a\t g:i a' ), $comment->comment_ID ); return get_comment_date( __( 'Y/m/d \a\t g:i a' ), $comment );
} }
/** /**

2
wp-includes/comment-functions.php
View File

@ -1202,7 +1202,7 @@ function wp_unspam_comment($comment_id) {
* *
* @since 1.0.0 * @since 1.0.0
* *
* @param int $comment_id Comment ID * @param int|WP_Comment $comment_id Comment ID or WP_Comment object
* @return false|string Status might be 'trash', 'approved', 'unapproved', 'spam'. False on failure. * @return false|string Status might be 'trash', 'approved', 'unapproved', 'spam'. False on failure.
*/ */
function wp_get_comment_status($comment_id) { function wp_get_comment_status($comment_id) {

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.4-alpha-33963'; $wp_version = '4.4-alpha-33964';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.