<!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>[16371] trunk/wp-admin: Fix post comments box and remove unused '
add-comment' ajax action.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16371">16371</a></dd>
<dt>Author</dt> <dd>scribu</dd>
<dt>Date</dt> <dd>2010-11-14 18:19:45 +0000 (Sun, 14 Nov 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix post comments box and remove unused 'add-comment' ajax action. See <a href="http://trac.wordpress.org/ticket/15338">#15338</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminadminajaxphp">trunk/wp-admin/admin-ajax.php</a></li>
<li><a href="#trunkwpadminincludesclasswpcommentslisttablephp">trunk/wp-admin/includes/class-wp-comments-list-table.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 (16370 => 16371)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/admin-ajax.php 2010-11-14 18:19:07 UTC (rev 16370)
+++ trunk/wp-admin/admin-ajax.php 2010-11-14 18:19:45 UTC (rev 16371)
</span><span class="lines">@@ -519,8 +519,7 @@
</span><span class="cx"> $x->send();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( isset($_POST['screen']) )
- set_current_screen($_POST['screen']);
</del><ins>+ set_current_screen( $_POST['screen'] );
</ins><span class="cx">
</span><span class="cx"> $wp_list_table = get_list_table('WP_Terms_List_Table');
</span><span class="cx">
</span><span class="lines">@@ -581,33 +580,6 @@
</span><span class="cx">
</span><span class="cx"> exit;
</span><span class="cx"> break;
</span><del>-case 'add-comment' :
- check_ajax_referer( $action );
- if ( !current_user_can( 'edit_posts' ) )
- die('-1');
-
- $wp_list_table = get_list_table('WP_Comments_List_Table');
- $wp_list_table->from_ajax = true;
-
- $wp_list_table->prepare_items();
-
- if ( !$wp_list_table->has_items() )
- die('1');
-
- $x = new WP_Ajax_Response();
- foreach ( $wp_list_table->items as $comment ) {
- ob_start();
- $wp_list_table->single_row( $comment );
- $comment_list_item = ob_get_contents();
- ob_end_clean();
- $x->add( array(
- 'what' => 'comment',
- 'id' => $comment->comment_ID,
- 'data' => $comment_list_item
- ) );
- }
- $x->send();
- break;
</del><span class="cx"> case 'get-comments' :
</span><span class="cx"> check_ajax_referer( $action );
</span><span class="cx">
</span><span class="lines">@@ -615,6 +587,8 @@
</span><span class="cx"> if ( !current_user_can( 'edit_post', $post_ID ) )
</span><span class="cx"> die('-1');
</span><span class="cx">
</span><ins>+ set_current_screen( 'edit-comments' );
+
</ins><span class="cx"> $wp_list_table = get_list_table('WP_Post_Comments_List_Table');
</span><span class="cx">
</span><span class="cx"> $wp_list_table->prepare_items();
</span><span class="lines">@@ -1161,8 +1135,7 @@
</span><span class="cx"> die( __('You are not allowed to edit this post.') );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( isset($_POST['screen']) )
- set_current_screen($_POST['screen']);
</del><ins>+ set_current_screen( $_POST['screen'] );
</ins><span class="cx">
</span><span class="cx"> if ( $last = wp_check_post_lock( $post_ID ) ) {
</span><span class="cx"> $last_user = get_userdata( $last );
</span><span class="lines">@@ -1209,7 +1182,7 @@
</span><span class="cx"> case 'inline-save-tax':
</span><span class="cx"> check_ajax_referer( 'taxinlineeditnonce', '_inline_edit' );
</span><span class="cx">
</span><del>- set_current_screen('edit-' . $_POST['taxonomy']);
</del><ins>+ set_current_screen( 'edit-' . $_POST['taxonomy'] );
</ins><span class="cx">
</span><span class="cx"> $wp_list_table = get_list_table('WP_Terms_List_Table');
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminincludesclasswpcommentslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-comments-list-table.php (16370 => 16371)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-comments-list-table.php 2010-11-14 18:19:07 UTC (rev 16370)
+++ trunk/wp-admin/includes/class-wp-comments-list-table.php 2010-11-14 18:19:45 UTC (rev 16371)
</span><span class="lines">@@ -17,7 +17,6 @@
</span><span class="cx"> class WP_Comments_List_Table extends WP_List_Table {
</span><span class="cx">
</span><span class="cx"> var $checkbox = true;
</span><del>- var $from_ajax = false;
</del><span class="cx">
</span><span class="cx"> var $pending_count = array();
</span><span class="cx">
</span><span class="lines">@@ -411,7 +410,7 @@
</span><span class="cx"> ( ( ( 'approve' == $action || 'unapprove' == $action ) && 2 === $i ) || 1 === $i ) ? $sep = '' : $sep = ' | ';
</span><span class="cx">
</span><span class="cx"> // Reply and quickedit need a hide-if-no-js span when not added with ajax
</span><del>- if ( ( 'reply' == $action || 'quickedit' == $action ) && ! $this->from_ajax )
</del><ins>+ if ( ( 'reply' == $action || 'quickedit' == $action ) && ! defined('DOING_AJAX') )
</ins><span class="cx"> $action .= ' hide-if-no-js';
</span><span class="cx"> elseif ( ( $action == 'untrash' && $the_comment_status == 'trash' ) || ( $action == 'unspam' && $the_comment_status == 'spam' ) ) {
</span><span class="cx"> if ( '1' == get_comment_meta( $comment->comment_ID, '_wp_trash_meta_status', true ) )
</span></span></pre>
</div>
</div>
</body>
</html>