<!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>[25433] trunk: Fix some undefined index notices related to Comment unit tests:</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/25433">25433</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2013-09-13 22:17:51 +0000 (Fri, 13 Sep 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix some undefined index notices related to Comment unit tests:
* There are several places where a `$_POST` index was unchecked before setting a variable
* In `wp_notify_postauthor()`, `$comment` was being returned null, but its properties were being accessed.
* In `check_ajax_referer()`, 3 different values can be checked for nonce on `$_REQUEST`, but only 1 had an `isset()`
See <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="#trunksrcwpadminincludescommentphp">trunk/src/wp-admin/includes/comment.php</a></li>
<li><a href="#trunksrcwpincludespluggablephp">trunk/src/wp-includes/pluggable.php</a></li>
<li><a href="#trunktestsphpunittestsajaxReplytoCommentphp">trunk/tests/phpunit/tests/ajax/ReplytoComment.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 (25432 => 25433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/ajax-actions.php 2013-09-13 21:32:54 UTC (rev 25432)
+++ trunk/src/wp-admin/includes/ajax-actions.php 2013-09-13 22:17:51 UTC (rev 25433)
</span><span class="lines">@@ -547,7 +547,7 @@
</span><span class="cx"> wp_die( -1 );
</span><span class="cx">
</span><span class="cx"> $current = wp_get_comment_status( $comment->comment_ID );
</span><del>- if ( $_POST['new'] == $current )
</del><ins>+ if ( isset( $_POST['new'] ) && $_POST['new'] == $current )
</ins><span class="cx"> wp_die( time() );
</span><span class="cx">
</span><span class="cx"> check_ajax_referer( "approve-comment_$id" );
</span><span class="lines">@@ -751,6 +751,9 @@
</span><span class="cx"> $comment_author_url = wp_slash( $user->user_url );
</span><span class="cx"> $comment_content = trim($_POST['content']);
</span><span class="cx"> if ( current_user_can( 'unfiltered_html' ) ) {
</span><ins>+ if ( ! isset( $_POST['_wp_unfiltered_html_comment'] ) )
+ $_POST['_wp_unfiltered_html_comment'] = '';
+
</ins><span class="cx"> if ( wp_create_nonce( 'unfiltered-html-comment' ) != $_POST['_wp_unfiltered_html_comment'] ) {
</span><span class="cx"> kses_remove_filters(); // start with a clean slate
</span><span class="cx"> kses_init_filters(); // set up the filters
</span><span class="lines">@@ -763,7 +766,9 @@
</span><span class="cx"> if ( '' == $comment_content )
</span><span class="cx"> wp_die( __( 'ERROR: please type a comment.' ) );
</span><span class="cx">
</span><del>- $comment_parent = absint($_POST['comment_ID']);
</del><ins>+ $comment_parent = 0;
+ if ( isset( $_POST['comment_ID'] ) )
+ $comment_parent = absint( $_POST['comment_ID'] );
</ins><span class="cx"> $comment_auto_approved = false;
</span><span class="cx"> $commentdata = compact('comment_post_ID', 'comment_author', 'comment_author_email', 'comment_author_url', 'comment_content', 'comment_type', 'comment_parent', 'user_ID');
</span><span class="cx">
</span><span class="lines">@@ -784,19 +789,18 @@
</span><span class="cx"> $position = ( isset($_POST['position']) && (int) $_POST['position'] ) ? (int) $_POST['position'] : '-1';
</span><span class="cx">
</span><span class="cx"> ob_start();
</span><del>- if ( 'dashboard' == $_REQUEST['mode'] ) {
- require_once( ABSPATH . 'wp-admin/includes/dashboard.php' );
- _wp_dashboard_recent_comments_row( $comment );
</del><ins>+ if ( isset( $_REQUEST['mode'] ) && 'dashboard' == $_REQUEST['mode'] ) {
+ require_once( ABSPATH . 'wp-admin/includes/dashboard.php' );
+ _wp_dashboard_recent_comments_row( $comment );
+ } else {
+ if ( isset( $_REQUEST['mode'] ) && 'single' == $_REQUEST['mode'] ) {
+ $wp_list_table = _get_list_table('WP_Post_Comments_List_Table', array( 'screen' => 'edit-comments' ) );
</ins><span class="cx"> } else {
</span><del>- if ( 'single' == $_REQUEST['mode'] ) {
- $wp_list_table = _get_list_table('WP_Post_Comments_List_Table', array( 'screen' => 'edit-comments' ) );
- } else {
- $wp_list_table = _get_list_table('WP_Comments_List_Table', array( 'screen' => 'edit-comments' ) );
- }
- $wp_list_table->single_row( $comment );
</del><ins>+ $wp_list_table = _get_list_table('WP_Comments_List_Table', array( 'screen' => 'edit-comments' ) );
</ins><span class="cx"> }
</span><del>- $comment_list_item = ob_get_contents();
- ob_end_clean();
</del><ins>+ $wp_list_table->single_row( $comment );
+ }
+ $comment_list_item = ob_get_clean();
</ins><span class="cx">
</span><span class="cx"> $response = array(
</span><span class="cx"> 'what' => 'comment',
</span><span class="lines">@@ -825,7 +829,8 @@
</span><span class="cx"> if ( '' == $_POST['content'] )
</span><span class="cx"> wp_die( __( 'ERROR: please type a comment.' ) );
</span><span class="cx">
</span><del>- $_POST['comment_status'] = $_POST['status'];
</del><ins>+ if ( isset( $_POST['status'] ) )
+ $_POST['comment_status'] = $_POST['status'];
</ins><span class="cx"> edit_comment();
</span><span class="cx">
</span><span class="cx"> $position = ( isset($_POST['position']) && (int) $_POST['position']) ? (int) $_POST['position'] : '-1';
</span><span class="lines">@@ -837,9 +842,8 @@
</span><span class="cx"> $comment = get_comment( $comment_id );
</span><span class="cx">
</span><span class="cx"> ob_start();
</span><del>- $wp_list_table->single_row( $comment );
- $comment_list_item = ob_get_contents();
- ob_end_clean();
</del><ins>+ $wp_list_table->single_row( $comment );
+ $comment_list_item = ob_get_clean();
</ins><span class="cx">
</span><span class="cx"> $x = new WP_Ajax_Response();
</span><span class="cx">
</span></span></pre></div>
<a id="trunksrcwpadminincludescommentphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/comment.php (25432 => 25433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/comment.php 2013-09-13 21:32:54 UTC (rev 25432)
+++ trunk/src/wp-admin/includes/comment.php 2013-09-13 22:17:51 UTC (rev 25433)
</span><span class="lines">@@ -36,12 +36,18 @@
</span><span class="cx"> if ( ! current_user_can( 'edit_comment', (int) $_POST['comment_ID'] ) )
</span><span class="cx"> wp_die ( __( 'You are not allowed to edit comments on this post.' ) );
</span><span class="cx">
</span><del>- $_POST['comment_author'] = $_POST['newcomment_author'];
- $_POST['comment_author_email'] = $_POST['newcomment_author_email'];
- $_POST['comment_author_url'] = $_POST['newcomment_author_url'];
- $_POST['comment_approved'] = $_POST['comment_status'];
- $_POST['comment_content'] = $_POST['content'];
- $_POST['comment_ID'] = (int) $_POST['comment_ID'];
</del><ins>+ if ( isset( $_POST['newcomment_author'] ) )
+ $_POST['comment_author'] = $_POST['newcomment_author'];
+ if ( isset( $_POST['newcomment_author_email'] ) )
+ $_POST['comment_author_email'] = $_POST['newcomment_author_email'];
+ if ( isset( $_POST['newcomment_author_url'] ) )
+ $_POST['comment_author_url'] = $_POST['newcomment_author_url'];
+ if ( isset( $_POST['comment_status'] ) )
+ $_POST['comment_approved'] = $_POST['comment_status'];
+ if ( isset( $_POST['content'] ) )
+ $_POST['comment_content'] = $_POST['content'];
+ if ( isset( $_POST['comment_ID'] ) )
+ $_POST['comment_ID'] = (int) $_POST['comment_ID'];
</ins><span class="cx">
</span><span class="cx"> foreach ( array ('aa', 'mm', 'jj', 'hh', 'mn') as $timeunit ) {
</span><span class="cx"> if ( !empty( $_POST['hidden_' . $timeunit] ) && $_POST['hidden_' . $timeunit] != $_POST[$timeunit] ) {
</span></span></pre></div>
<a id="trunksrcwpincludespluggablephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/pluggable.php (25432 => 25433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/pluggable.php 2013-09-13 21:32:54 UTC (rev 25432)
+++ trunk/src/wp-includes/pluggable.php 2013-09-13 22:17:51 UTC (rev 25433)
</span><span class="lines">@@ -830,11 +830,17 @@
</span><span class="cx"> * @param string $query_arg where to look for nonce in $_REQUEST (since 2.5)
</span><span class="cx"> */
</span><span class="cx"> function check_ajax_referer( $action = -1, $query_arg = false, $die = true ) {
</span><del>- if ( $query_arg )
</del><ins>+ $nonce = '';
+
+ if ( $query_arg && isset( $_REQUEST[$query_arg] ) )
</ins><span class="cx"> $nonce = $_REQUEST[$query_arg];
</span><del>- else
- $nonce = isset($_REQUEST['_ajax_nonce']) ? $_REQUEST['_ajax_nonce'] : $_REQUEST['_wpnonce'];
</del><span class="cx">
</span><ins>+ if ( isset( $_REQUEST['_ajax_nonce'] ) )
+ $nonce = $_REQUEST['_ajax_nonce'];
+
+ if ( isset( $_REQUEST['_wpnonce'] ) )
+ $nonce = $_REQUEST['_wpnonce'];
+
</ins><span class="cx"> $result = wp_verify_nonce( $nonce, $action );
</span><span class="cx">
</span><span class="cx"> if ( $die && false == $result ) {
</span><span class="lines">@@ -1009,6 +1015,9 @@
</span><span class="cx"> */
</span><span class="cx"> function wp_notify_postauthor( $comment_id, $comment_type = '' ) {
</span><span class="cx"> $comment = get_comment( $comment_id );
</span><ins>+ if ( empty( $comment ) )
+ return false;
+
</ins><span class="cx"> $post = get_post( $comment->comment_post_ID );
</span><span class="cx"> $author = get_userdata( $post->post_author );
</span><span class="cx">
</span></span></pre></div>
<a id="trunktestsphpunittestsajaxReplytoCommentphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/phpunit/tests/ajax/ReplytoComment.php (25432 => 25433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/tests/ajax/ReplytoComment.php 2013-09-13 21:32:54 UTC (rev 25432)
+++ trunk/tests/phpunit/tests/ajax/ReplytoComment.php 2013-09-13 22:17:51 UTC (rev 25433)
</span><span class="lines">@@ -38,6 +38,8 @@
</span><span class="cx">
</span><span class="cx"> $post_id = $this->factory->post->create( array( 'post_status' => 'draft' ) );
</span><span class="cx"> $this->_draft_post = get_post( $post_id );
</span><ins>+
+ $_SERVER['REMOTE_ADDR'] = '';
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre>
</div>
</div>
</body>
</html>