<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[15512] trunk/wp-admin:
Add the floated_admin_avatar filter from WP_Comments_Table.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15512">15512</a></dd>
<dt>Author</dt> <dd>scribu</dd>
<dt>Date</dt> <dd>2010-08-20 11:18:41 +0000 (Fri, 20 Aug 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add the floated_admin_avatar filter from WP_Comments_Table. See <a href="http://trac.wordpress.org/ticket/14637">#14637</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminadminajaxphp">trunk/wp-admin/admin-ajax.php</a></li>
<li><a href="#trunkwpadminincludescommentphp">trunk/wp-admin/includes/comment.php</a></li>
<li><a href="#trunkwpadminincludesdefaultlisttablesphp">trunk/wp-admin/includes/default-list-tables.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminadminajaxphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/admin-ajax.php (15511 => 15512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/admin-ajax.php 2010-08-19 20:10:28 UTC (rev 15511)
+++ trunk/wp-admin/admin-ajax.php 2010-08-20 11:18:41 UTC (rev 15512)
</span><span class="lines">@@ -632,9 +632,6 @@
</span><span class="cx"> if ( !$table->has_items() )
</span><span class="cx"> die('1');
</span><span class="cx">
</span><del>- if ( get_option('show_avatars') )
- add_filter( 'comment_author', 'floated_admin_avatar' );
-
</del><span class="cx"> $x = new WP_Ajax_Response();
</span><span class="cx"> foreach ( $table->items as $comment ) {
</span><span class="cx"> get_comment( $comment );
</span><span class="lines">@@ -727,9 +724,6 @@
</span><span class="cx"> $position = ( isset($_POST['position']) && (int) $_POST['position']) ? (int) $_POST['position'] : '-1';
</span><span class="cx"> $checkbox = ( isset($_POST['checkbox']) && true == $_POST['checkbox'] ) ? 1 : 0;
</span><span class="cx">
</span><del>- if ( get_option('show_avatars') && 'single' != $mode )
- add_filter( 'comment_author', 'floated_admin_avatar' );
-
</del><span class="cx"> $x = new WP_Ajax_Response();
</span><span class="cx">
</span><span class="cx"> ob_start();
</span><span class="lines">@@ -770,9 +764,6 @@
</span><span class="cx"> $checkbox = ( isset($_POST['checkbox']) && true == $_POST['checkbox'] ) ? 1 : 0;
</span><span class="cx"> $comments_listing = isset($_POST['comments_listing']) ? $_POST['comments_listing'] : '';
</span><span class="cx">
</span><del>- if ( get_option('show_avatars') && 'single' != $mode )
- add_filter( 'comment_author', 'floated_admin_avatar' );
-
</del><span class="cx"> require_once( './includes/default-list-tables.php' );
</span><span class="cx"> $table = new WP_Comments_Table();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminincludescommentphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/comment.php (15511 => 15512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/comment.php 2010-08-19 20:10:28 UTC (rev 15511)
+++ trunk/wp-admin/includes/comment.php 2010-08-20 11:18:41 UTC (rev 15512)
</span><span class="lines">@@ -158,10 +158,4 @@
</span><span class="cx"> if ( 'true' == get_user_option( 'comment_shortcuts' ) )
</span><span class="cx"> wp_enqueue_script( 'jquery-table-hotkeys' );
</span><span class="cx"> }
</span><del>-
-if ( is_admin() && isset($pagenow) && ('edit-comments.php' == $pagenow || 'edit.php' == $pagenow) ) {
- if ( get_option('show_avatars') )
- add_filter( 'comment_author', 'floated_admin_avatar' );
-}
-
</del><span class="cx"> ?>
</span></span></pre></div>
<a id="trunkwpadminincludesdefaultlisttablesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/default-list-tables.php (15511 => 15512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/default-list-tables.php 2010-08-19 20:10:28 UTC (rev 15511)
+++ trunk/wp-admin/includes/default-list-tables.php 2010-08-20 11:18:41 UTC (rev 15512)
</span><span class="lines">@@ -1929,6 +1929,13 @@
</span><span class="cx"> class WP_Comments_Table extends WP_List_Table {
</span><span class="cx">
</span><span class="cx"> function WP_Comments_Table() {
</span><ins>+ global $mode;
+
+ $mode = ( empty( $_REQUEST['mode'] ) ) ? 'detail' : $_REQUEST['mode'];
+
+ if ( get_option('show_avatars') && 'single' != $mode )
+ add_filter( 'comment_author', 'floated_admin_avatar' );
+
</ins><span class="cx"> parent::WP_List_Table( array(
</span><span class="cx"> 'screen' => 'edit-comments',
</span><span class="cx"> 'plural' => 'comments'
</span><span class="lines">@@ -1941,12 +1948,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function prepare_items() {
</span><del>- global $post_id, $comment_status, $mode, $search;
</del><ins>+ global $post_id, $comment_status, $search;
</ins><span class="cx">
</span><span class="cx"> $post_id = isset( $_REQUEST['p'] ) ? absint( $_REQUEST['p'] ) : 0;
</span><span class="cx">
</span><del>- $mode = ( empty( $_REQUEST['mode'] ) ) ? 'detail' : $_REQUEST['mode'];
-
</del><span class="cx"> $comment_status = isset( $_REQUEST['comment_status'] ) ? $_REQUEST['comment_status'] : 'all';
</span><span class="cx"> if ( !in_array( $comment_status, array( 'all', 'moderated', 'approved', 'spam', 'trash' ) ) )
</span><span class="cx"> $comment_status = 'all';
</span></span></pre>
</div>
</div>
</body>
</html>