Changeset 15512

Timestamp:

08/20/2010 11:18:41 AM (14 years ago)

Author:

scribu

Message:

Add the floated_admin_avatar filter from WP_Comments_Table. See #14637

Location:

trunk/wp-admin

Files:

• admin-ajax.php (modified) (3 diffs)
• includes/comment.php (modified) (1 diff)
• includes/default-list-tables.php (modified) (2 diffs)

trunk/wp-admin/admin-ajax.php

@@ -633 +633 @@
         die('1');
 
-    if ( get_option('show_avatars') )
-        add_filter( 'comment_author', 'floated_admin_avatar' );
-
     $x = new WP_Ajax_Response();
     foreach ( $table->items as $comment ) {
@@ -728 +725 @@
     $checkbox = ( isset($_POST['checkbox']) && true == $_POST['checkbox'] ) ? 1 : 0;
 
-    if ( get_option('show_avatars') && 'single' != $mode )
-        add_filter( 'comment_author', 'floated_admin_avatar' );
-
     $x = new WP_Ajax_Response();
 
@@ -770 +764 @@
     $checkbox = ( isset($_POST['checkbox']) && true == $_POST['checkbox'] ) ? 1 : 0;
     $comments_listing = isset($_POST['comments_listing']) ? $_POST['comments_listing'] : '';
-
-    if ( get_option('show_avatars') && 'single' != $mode )
-        add_filter( 'comment_author', 'floated_admin_avatar' );
 
     require_once( './includes/default-list-tables.php' );

trunk/wp-admin/includes/comment.php

@@ -159 +159 @@
         wp_enqueue_script( 'jquery-table-hotkeys' );
 }
-
-if ( is_admin() && isset($pagenow) && ('edit-comments.php' == $pagenow || 'edit.php' == $pagenow) ) {
-    if ( get_option('show_avatars') )
-        add_filter( 'comment_author', 'floated_admin_avatar' );
-}
-
 ?>

trunk/wp-admin/includes/default-list-tables.php

@@ -1930 +1930 @@
 
     function WP_Comments_Table() {
+        global $mode;
+
+        $mode = ( empty( $_REQUEST['mode'] ) ) ? 'detail' : $_REQUEST['mode'];
+
+        if ( get_option('show_avatars') && 'single' != $mode )
+            add_filter( 'comment_author', 'floated_admin_avatar' );
+
         parent::WP_List_Table( array(
             'screen' => 'edit-comments',
@@ -1942 +1949 @@
 
     function prepare_items() {
-        global $post_id, $comment_status, $mode, $search;
+        global $post_id, $comment_status, $search;
 
         $post_id = isset( $_REQUEST['p'] ) ? absint( $_REQUEST['p'] ) : 0;
-
-        $mode = ( empty( $_REQUEST['mode'] ) ) ? 'detail' : $_REQUEST['mode'];
 
         $comment_status = isset( $_REQUEST['comment_status'] ) ? $_REQUEST['comment_status'] : 'all';