Changeset 33828

Timestamp:

08/31/2015 08:58:12 PM (10 years ago)

Author:

wonderboymusic

Message:

Fix warnings after [33826]. Only only one function call needs a global $comment, we shall hamburger it.

See #11566.

File:

• trunk/src/wp-admin/includes/class-wp-comments-list-table.php (modified) (8 diffs)

trunk/src/wp-admin/includes/class-wp-comments-list-table.php

@@ -43 +43 @@
         $post_id = isset( $_REQUEST['p'] ) ? absint( $_REQUEST['p'] ) : 0;
 
-        if ( get_option('show_avatars') )
-            add_filter( 'comment_author', 'floated_admin_avatar' );
+        if ( get_option( 'show_avatars' ) ) {
+            add_filter( 'comment_author', array( $this, 'floated_admin_avatar' ), 10, 2 );
+        }
 
         parent::__construct( array(
@@ -52 +53 @@
             'screen' => isset( $args['screen'] ) ? $args['screen'] : null,
         ) );
+    }
+
+    public function floated_admin_avatar( $name, $comment_ID ) {
+        $comment = get_comment( $comment_ID );
+        $avatar = get_avatar( $comment, 32, 'mystery' );
+        return "$avatar $name";
     }
 
@@ -592 +599 @@
         printf( __( 'Submitted on <a href="%1$s">%2$s at %3$s</a>' ), $comment_url,
             /* translators: comment date format. See http://php.net/date */
-            get_comment_date( __( 'Y/m/d' ) ),
-            get_comment_date( get_option( 'time_format' ) )
+            get_comment_date( __( 'Y/m/d' ), $comment->comment_ID ),
+            get_comment_date( get_option( 'time_format' ), $comment->comment_ID )
         );
 
@@ -604 +611 @@
 
         echo '</div>';
-        comment_text();
+        comment_text( $comment->comment_ID );
         if ( $this->user_can ) { ?>
         <div id="inline-<?php echo $comment->comment_ID; ?>" class="hidden">
@@ -629 +636 @@
         global $comment_status;
 
-        $author_url = get_comment_author_url();
+        $author_url = get_comment_author_url( $comment->comment_ID );
         if ( 'http://' == $author_url ) {
             $author_url = '';
@@ -640 +647 @@
 
 
-        echo "<strong>"; comment_author(); echo '</strong><br />';
+        echo "<strong>"; comment_author( $comment->comment_ID ); echo '</strong><br />';
         if ( !empty( $author_url ) ) {
             echo "<a title='$author_url' href='$author_url'>$author_url_display</a><br />";
@@ -647 +654 @@
         if ( $this->user_can ) {
             if ( !empty( $comment->comment_author_email ) ) {
+                $GLOBALS['comment'] = $comment;
                 comment_author_email_link();
                 echo '<br />';
+                unset( $GLOBALS['comment'] );
             }
 
-            $author_ip = get_comment_author_IP();
+            $author_ip = get_comment_author_IP( $comment->comment_ID );
             if ( $author_ip ) {
                 $author_ip_url = add_query_arg( array( 's' => $author_ip, 'mode' => 'detail' ), 'edit-comments.php' );
@@ -666 +675 @@
      * @return string
      */
-    public function column_date() {
-        return get_comment_date( __( 'Y/m/d \a\t g:i a' ) );
+    public function column_date( $comment ) {
+        return get_comment_date( __( 'Y/m/d \a\t g:i a' ), $comment->comment_ID );
     }