<!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>[15497] trunk/wp-admin: Fix Comments meta box in post editing screen.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15497">15497</a></dd>
<dt>Author</dt> <dd>scribu</dd>
<dt>Date</dt> <dd>2010-08-12 23:58:49 +0000 (Thu, 12 Aug 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix Comments meta box in post editing screen. See <a href="http://trac.wordpress.org/ticket/14579">#14579</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminadminajaxphp">trunk/wp-admin/admin-ajax.php</a></li>
<li><a href="#trunkwpadminincludesdefaultlisttablesphp">trunk/wp-admin/includes/default-list-tables.php</a></li>
<li><a href="#trunkwpadminincludesmetaboxesphp">trunk/wp-admin/includes/meta-boxes.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 (15496 => 15497)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/admin-ajax.php 2010-08-12 23:21:05 UTC (rev 15496)
+++ trunk/wp-admin/admin-ajax.php 2010-08-12 23:58:49 UTC (rev 15497)
</span><span class="lines">@@ -627,17 +627,16 @@
</span><span class="cx">
</span><span class="cx"> require_once( './includes/default-list-tables.php' );
</span><span class="cx"> $table = new WP_Comments_Table();
</span><ins>+ $table->prepare_items();
</ins><span class="cx">
</span><del>- global $comments;
-
- if ( !$comments )
</del><ins>+ if ( !$table->has_items() )
</ins><span class="cx"> die('1');
</span><span class="cx">
</span><span class="cx"> if ( get_option('show_avatars') )
</span><span class="cx"> add_filter( 'comment_author', 'floated_admin_avatar' );
</span><span class="cx">
</span><span class="cx"> $x = new WP_Ajax_Response();
</span><del>- foreach ( (array) $comments as $comment ) {
</del><ins>+ foreach ( $table->items as $comment ) {
</ins><span class="cx"> get_comment( $comment );
</span><span class="cx"> ob_start();
</span><span class="cx"> $table->single_row( $comment->comment_ID, $mode, $status, true, true );
</span><span class="lines">@@ -660,15 +659,14 @@
</span><span class="cx">
</span><span class="cx"> require_once( './includes/default-list-tables.php' );
</span><span class="cx"> $table = new WP_Comments_Table();
</span><ins>+ $table->prepare_items();
</ins><span class="cx">
</span><del>- global $comments;
-
- if ( !$comments )
</del><ins>+ if ( !$table->has_items() )
</ins><span class="cx"> die('1');
</span><span class="cx">
</span><span class="cx"> $comment_list_item = '';
</span><span class="cx"> $x = new WP_Ajax_Response();
</span><del>- foreach ( (array) $comments as $comment ) {
</del><ins>+ foreach ( $table->items as $comment ) {
</ins><span class="cx"> get_comment( $comment );
</span><span class="cx"> ob_start();
</span><span class="cx"> $table->single_row( $comment->comment_ID, 'single', false, false );
</span></span></pre></div>
<a id="trunkwpadminincludesdefaultlisttablesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/default-list-tables.php (15496 => 15497)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/default-list-tables.php 2010-08-12 23:21:05 UTC (rev 15496)
+++ trunk/wp-admin/includes/default-list-tables.php 2010-08-12 23:58:49 UTC (rev 15497)
</span><span class="lines">@@ -2111,7 +2111,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function prepare_items() {
</span><del>- global $comments, $extra_comments, $total_comments, $post_id, $comment_status, $mode;
</del><ins>+ global $post_id, $comment_status, $mode;
</ins><span class="cx">
</span><span class="cx"> $post_id = isset( $_REQUEST['post_ID'] ) ? absint( $_REQUEST['post_ID'] ) : 0;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminincludesmetaboxesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/meta-boxes.php (15496 => 15497)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/meta-boxes.php 2010-08-12 23:21:05 UTC (rev 15496)
+++ trunk/wp-admin/includes/meta-boxes.php 2010-08-12 23:58:49 UTC (rev 15497)
</span><span class="lines">@@ -460,11 +460,15 @@
</span><span class="cx">
</span><span class="cx"> wp_nonce_field( 'get-comments', 'add_comment_nonce', false );
</span><span class="cx"> add_filter('manage_edit-comments_columns', 'post_comment_meta_box_thead', 8, 1);
</span><ins>+ add_filter('manage_edit-comments_sortable_columns', create_function('', 'return array();'), 8);
+
+ require_once( './includes/default-list-tables.php' );
+ $table = new WP_Comments_Table;
</ins><span class="cx"> ?>
</span><span class="cx">
</span><span class="cx"> <table class="widefat comments-box fixed" cellspacing="0" style="display:none;">
</span><span class="cx"> <thead><tr>
</span><del>- <?php print_column_headers('edit-comments'); ?>
</del><ins>+ <?php $table->print_column_headers(); ?>
</ins><span class="cx"> </tr></thead>
</span><span class="cx"> <tbody id="the-comment-list" class="list:comment"></tbody>
</span><span class="cx"> </table>
</span></span></pre>
</div>
</div>
</body>
</html>