<!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" />
<title>[25438] trunk: Fix several esoteric errors related to AJAX unit tests for comments:</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/25438">25438</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2013-09-14 18:35:43 +0000 (Sat, 14 Sep 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix several esoteric errors related to AJAX unit tests for comments:
* `wp_ajax_get_comments()` relies on the `$post_id` global - even though `$_POST['p']` is passed to every action in the test methods. If `$post_id` is still lingering in between tests and doesn't match `p` in the request, the cap check might pass while the queries for comments will blow up. I added `unset( $GLOBALS['post_id'] )` to `Tests_Ajax_GetComments::setUp()`.
* If the global `$post_id` is empty, but `$_REQUEST['p']` is not, `$post_id` is now set to `absint( $_REQUEST['p'] )` and sanity-checked in `wp_ajax_get_comments()`.
* `map_meta_cap()` always assumes that `get_comment()` succeeds when checking for the `edit_comment` cap. It doesn't. I added sanity checks in a few places where it will break early if `get_post()` or `get_comment()` are empty.
* `wp_update_comment()` always assumes `get_comment()` succeeds. It doesn't. I added a check for empty.
All AJAX unit tests run and pass in debug mode. All general unit tests pass against these changes.
Fixes <a href="http://core.trac.wordpress.org/ticket/25282">#25282</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesajaxactionsphp">trunk/src/wp-admin/includes/ajax-actions.php</a></li>
<li><a href="#trunksrcwpincludescapabilitiesphp">trunk/src/wp-includes/capabilities.php</a></li>
<li><a href="#trunksrcwpincludescommentphp">trunk/src/wp-includes/comment.php</a></li>
<li><a href="#trunktestsphpunitincludestestcaseajaxphp">trunk/tests/phpunit/includes/testcase-ajax.php</a></li>
<li><a href="#trunktestsphpunittestsajaxGetCommentsphp">trunk/tests/phpunit/tests/ajax/GetComments.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesajaxactionsphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/ajax-actions.php (25437 => 25438)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/ajax-actions.php 2013-09-14 14:33:19 UTC (rev 25437)
+++ trunk/src/wp-admin/includes/ajax-actions.php 2013-09-14 18:35:43 UTC (rev 25438)
</span><span class="lines">@@ -695,9 +695,18 @@
</span><span class="cx">
</span><span class="cx"> check_ajax_referer( $action );
</span><span class="cx">
</span><ins>+ if ( empty( $post_id ) && ! empty( $_REQUEST['p'] ) ) {
+ $id = absint( $_REQUEST['p'] );
+ if ( ! empty( $id ) )
+ $post_id = $id;
+ }
+
+ if ( empty( $post_id ) )
+ wp_die( -1 );
+
</ins><span class="cx"> $wp_list_table = _get_list_table( 'WP_Post_Comments_List_Table', array( 'screen' => 'edit-comments' ) );
</span><span class="cx">
</span><del>- if ( !current_user_can( 'edit_post', $post_id ) )
</del><ins>+ if ( ! current_user_can( 'edit_post', $post_id ) )
</ins><span class="cx"> wp_die( -1 );
</span><span class="cx">
</span><span class="cx"> $wp_list_table->prepare_items();
</span><span class="lines">@@ -840,6 +849,8 @@
</span><span class="cx"> $wp_list_table = _get_list_table( $checkbox ? 'WP_Comments_List_Table' : 'WP_Post_Comments_List_Table', array( 'screen' => 'edit-comments' ) );
</span><span class="cx">
</span><span class="cx"> $comment = get_comment( $comment_id );
</span><ins>+ if ( empty( $comment->comment_ID ) )
+ wp_die( -1 );
</ins><span class="cx">
</span><span class="cx"> ob_start();
</span><span class="cx"> $wp_list_table->single_row( $comment );
</span></span></pre></div>
<a id="trunksrcwpincludescapabilitiesphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/capabilities.php (25437 => 25438)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/capabilities.php 2013-09-14 14:33:19 UTC (rev 25437)
+++ trunk/src/wp-includes/capabilities.php 2013-09-14 18:35:43 UTC (rev 25438)
</span><span class="lines">@@ -1066,6 +1066,8 @@
</span><span class="cx"> case 'edit_post':
</span><span class="cx"> case 'edit_page':
</span><span class="cx"> $post = get_post( $args[0] );
</span><ins>+ if ( empty( $post ) )
+ break;
</ins><span class="cx">
</span><span class="cx"> if ( 'revision' == $post->post_type ) {
</span><span class="cx"> $post = get_post( $post->post_parent );
</span><span class="lines">@@ -1170,6 +1172,8 @@
</span><span class="cx"> break;
</span><span class="cx"> case 'edit_comment':
</span><span class="cx"> $comment = get_comment( $args[0] );
</span><ins>+ if ( empty( $comment ) )
+ break;
</ins><span class="cx"> $post = get_post( $comment->comment_post_ID );
</span><span class="cx"> $caps = map_meta_cap( 'edit_post', $user_id, $post->ID );
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunksrcwpincludescommentphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/comment.php (25437 => 25438)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/comment.php 2013-09-14 14:33:19 UTC (rev 25437)
+++ trunk/src/wp-includes/comment.php 2013-09-14 18:35:43 UTC (rev 25438)
</span><span class="lines">@@ -1505,6 +1505,8 @@
</span><span class="cx">
</span><span class="cx"> // First, get all of the original fields
</span><span class="cx"> $comment = get_comment($commentarr['comment_ID'], ARRAY_A);
</span><ins>+ if ( empty( $comment ) )
+ return 0;
</ins><span class="cx">
</span><span class="cx"> // Escape data pulled from DB.
</span><span class="cx"> $comment = wp_slash($comment);
</span></span></pre></div>
<a id="trunktestsphpunitincludestestcaseajaxphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/phpunit/includes/testcase-ajax.php (25437 => 25438)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/includes/testcase-ajax.php 2013-09-14 14:33:19 UTC (rev 25437)
+++ trunk/tests/phpunit/includes/testcase-ajax.php 2013-09-14 18:35:43 UTC (rev 25438)
</span><span class="lines">@@ -131,7 +131,7 @@
</span><span class="cx"> $this->_last_response .= ob_get_clean();
</span><span class="cx">
</span><span class="cx"> if ( '' === $this->_last_response ) {
</span><del>- if ( is_scalar( $message) ) {
</del><ins>+ if ( is_scalar( $message ) ) {
</ins><span class="cx"> throw new WPAjaxDieStopException( (string) $message );
</span><span class="cx"> } else {
</span><span class="cx"> throw new WPAjaxDieStopException( '0' );
</span></span></pre></div>
<a id="trunktestsphpunittestsajaxGetCommentsphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/phpunit/tests/ajax/GetComments.php (25437 => 25438)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/tests/ajax/GetComments.php 2013-09-14 14:33:19 UTC (rev 25437)
+++ trunk/tests/phpunit/tests/ajax/GetComments.php 2013-09-14 18:35:43 UTC (rev 25438)
</span><span class="lines">@@ -38,6 +38,8 @@
</span><span class="cx">
</span><span class="cx"> $post_id = $this->factory->post->create();
</span><span class="cx"> $this->_no_comment_post = get_post( $post_id );
</span><ins>+
+ unset( $GLOBALS['post_id'] );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre>
</div>
</div>
</body>
</html>