<!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>[34570] trunk: XML-RPC: `wp.getComments` should be allowed to return approved comments to those without the `'moderate_comments'` cap.</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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/34570">34570</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/34570","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>wonderboymusic</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-09-26 02:48:47 +0000 (Sat, 26 Sep 2015)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>XML-RPC: `wp.getComments` should be allowed to return approved comments to those without the `'moderate_comments'` cap.
Adds (rewrites) unit tests from 4 years ago that we never committed because....
Props wonderboymusic, koke, ericmann, nprasath002.
Fixes <a href="https://core.trac.wordpress.org/ticket/17981">#17981</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesclasswpxmlrpcserverphp">trunk/src/wp-includes/class-wp-xmlrpc-server.php</a></li>
<li><a href="#trunktestsphpunittestsxmlrpcwpeditCommentphp">trunk/tests/phpunit/tests/xmlrpc/wp/editComment.php</a></li>
<li><a href="#trunktestsphpunittestsxmlrpcwpgetCommentsphp">trunk/tests/phpunit/tests/xmlrpc/wp/getComments.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesclasswpxmlrpcserverphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-xmlrpc-server.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-xmlrpc-server.php 2015-09-26 02:24:17 UTC (rev 34569)
+++ trunk/src/wp-includes/class-wp-xmlrpc-server.php 2015-09-26 02:48:47 UTC (rev 34570)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3155,18 +3155,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $password = $args[2];
</span><span class="cx" style="display: block; padding: 0 10px"> $comment_id = (int) $args[3];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( !$user = $this->login($username, $password) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $user = $this->login( $username, $password ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $this->error;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( !current_user_can( 'moderate_comments' ) )
- return new IXR_Error( 403, __( 'You are not allowed to moderate comments on this site.' ) );
-
</del><span class="cx" style="display: block; padding: 0 10px"> /** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'xmlrpc_call', 'wp.getComment' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! $comment = get_comment($comment_id) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $comment = get_comment( $comment_id ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return new IXR_Error( 404, __( 'Invalid comment ID.' ) );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! current_user_can( 'edit_comment', $comment_id ) ) {
+ return new IXR_Error( 403, __( 'You are not allowed to moderate or edit this comment.' ) );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> return $this->_prepare_comment( $comment );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3203,20 +3206,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $password = $args[2];
</span><span class="cx" style="display: block; padding: 0 10px"> $struct = isset( $args[3] ) ? $args[3] : array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( !$user = $this->login($username, $password) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $user = $this->login($username, $password ) )
</ins><span class="cx" style="display: block; padding: 0 10px"> return $this->error;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( !current_user_can( 'moderate_comments' ) )
- return new IXR_Error( 401, __( 'Sorry, you cannot edit comments.' ) );
-
</del><span class="cx" style="display: block; padding: 0 10px"> /** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'xmlrpc_call', 'wp.getComments' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( isset($struct['status']) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $struct['status'] ) )
</ins><span class="cx" style="display: block; padding: 0 10px"> $status = $struct['status'];
</span><span class="cx" style="display: block; padding: 0 10px"> else
</span><span class="cx" style="display: block; padding: 0 10px"> $status = '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! current_user_can( 'moderate_comments' ) && 'approve' !== $status ) {
+ return new IXR_Error( 401, __( 'Invalid comment status.' ) );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_id = '';
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset($struct['post_id']) )
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id = absint($struct['post_id']);
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3260,24 +3264,24 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * }
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool|IXR_Error {@link wp_delete_comment()}
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function wp_deleteComment($args) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function wp_deleteComment( $args ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->escape($args);
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $username = $args[1];
</span><span class="cx" style="display: block; padding: 0 10px"> $password = $args[2];
</span><span class="cx" style="display: block; padding: 0 10px"> $comment_ID = (int) $args[3];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( !$user = $this->login($username, $password) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $user = $this->login( $username, $password ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $this->error;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( !current_user_can( 'moderate_comments' ) )
- return new IXR_Error( 403, __( 'You are not allowed to moderate comments on this site.' ) );
-
- if ( ! get_comment($comment_ID) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! get_comment( $comment_ID ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return new IXR_Error( 404, __( 'Invalid comment ID.' ) );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( !current_user_can( 'edit_comment', $comment_ID ) )
- return new IXR_Error( 403, __( 'You are not allowed to moderate comments on this site.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( !current_user_can( 'edit_comment', $comment_ID ) ) {
+ return new IXR_Error( 403, __( 'You are not allowed to moderate or edit this comment.' ) );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'xmlrpc_call', 'wp.deleteComment' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3334,17 +3338,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $comment_ID = (int) $args[3];
</span><span class="cx" style="display: block; padding: 0 10px"> $content_struct = $args[4];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( !$user = $this->login($username, $password) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( !$user = $this->login( $username, $password ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $this->error;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( !current_user_can( 'moderate_comments' ) )
- return new IXR_Error( 403, __( 'You are not allowed to moderate comments on this site.' ) );
-
- if ( ! get_comment($comment_ID) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! get_comment( $comment_ID ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return new IXR_Error( 404, __( 'Invalid comment ID.' ) );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( !current_user_can( 'edit_comment', $comment_ID ) )
- return new IXR_Error( 403, __( 'You are not allowed to moderate comments on this site.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! current_user_can( 'edit_comment', $comment_ID ) ) {
+ return new IXR_Error( 403, __( 'You are not allowed to moderate or edit this comment.' ) );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'xmlrpc_call', 'wp.editComment' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3536,17 +3540,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * }
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array|IXR_Error
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function wp_getCommentStatusList($args) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function wp_getCommentStatusList( $args ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->escape( $args );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $username = $args[1];
</span><span class="cx" style="display: block; padding: 0 10px"> $password = $args[2];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( !$user = $this->login($username, $password) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $user = $this->login( $username, $password ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $this->error;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( !current_user_can( 'moderate_comments' ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! current_user_can( 'publish_posts' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return new IXR_Error( 403, __( 'You are not allowed access to details about this site.' ) );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'xmlrpc_call', 'wp.getCommentStatusList' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3576,16 +3582,24 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $password = $args[2];
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id = (int) $args[3];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( !$user = $this->login($username, $password) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $user = $this->login( $username, $password ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $this->error;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( !current_user_can( 'edit_posts' ) )
- return new IXR_Error( 403, __( 'You are not allowed access to details about comments.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post = get_post( $post_id, ARRAY_A );
+ if ( empty( $post['ID'] ) ) {
+ return new IXR_Error( 404, __( 'Invalid post ID.' ) );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! current_user_can( 'edit_post', $post_id ) ) {
+ return new IXR_Error( 403, __( 'You are not allowed access to details of this post.' ) );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'xmlrpc_call', 'wp.getCommentCount' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $count = wp_count_comments( $post_id );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'approved' => $count->approved,
</span><span class="cx" style="display: block; padding: 0 10px"> 'awaiting_moderation' => $count->moderated,
</span></span></pre></div>
<a id="trunktestsphpunittestsxmlrpcwpeditCommentphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/xmlrpc/wp/editComment.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/wp/editComment.php 2015-09-26 02:24:17 UTC (rev 34569)
+++ trunk/tests/phpunit/tests/xmlrpc/wp/editComment.php 2015-09-26 02:48:47 UTC (rev 34570)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4,6 +4,49 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group xmlrpc
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_XMLRPC_wp_editComment extends WP_XMLRPC_UnitTestCase {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ function test_author_can_edit_own_comment() {
+ $author_id = $this->make_user_by_role( 'author' );
+ $post_id = $this->factory->post->create( array(
+ 'post_title' => 'Post test by author',
+ 'post_author' => $author_id
+ ) );
+
+ $comment_id = wp_insert_comment(array(
+ 'comment_post_ID' => $post_id,
+ 'comment_author' => 'Commenter 1',
+ 'comment_author_url' => "http://example.com/1/",
+ 'comment_approved' => 1,
+ ));
+
+ $result = $this->myxmlrpcserver->wp_editComment( array( 1, 'author', 'author', $comment_id, array(
+ 'status' => 'hold'
+ ) ) );
+ $this->assertNotInstanceOf( 'IXR_Error', $result );
+ $this->assertTrue( $result );
+ }
+
+ function test_author_cannot_edit_others_comment() {
+ $this->make_user_by_role( 'author' );
+ $editor_id = $this->make_user_by_role( 'editor' );
+ $post_id = $this->factory->post->create( array(
+ 'post_title' => 'Post test by editor',
+ 'post_author' => $editor_id
+ ) );
+
+ $comment_id = wp_insert_comment( array(
+ 'comment_post_ID' => $post_id,
+ 'comment_author' => 'Commenter 2',
+ 'comment_author_url' => 'http://example.com/2/',
+ 'comment_approved' => 0,
+ ) );
+
+ $result = $this->myxmlrpcserver->wp_editComment( array( 1, 'author', 'author', $comment_id, array( 'status' => 'hold' ) ) );
+ $this->assertInstanceOf( 'IXR_Error', $result );
+ $this->assertEquals( 403, $result->code );
+ $this->assertEquals( __( 'You are not allowed to moderate or edit this comment.' ), $result->message );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> function test_trash_comment() {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'administrator' );
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id = $this->factory->post->create();
</span></span></pre></div>
<a id="trunktestsphpunittestsxmlrpcwpgetCommentsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/xmlrpc/wp/getComments.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/wp/getComments.php 2015-09-26 02:24:17 UTC (rev 34569)
+++ trunk/tests/phpunit/tests/xmlrpc/wp/getComments.php 2015-09-26 02:48:47 UTC (rev 34570)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -42,10 +42,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_post_filter() {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $filter = array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $results = $this->myxmlrpcserver->wp_getComments( array( 1, 'editor', 'editor', array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_id' => $this->post_id
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- );
- $results = $this->myxmlrpcserver->wp_getComments( array( 1, 'editor', 'editor', $filter ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotInstanceOf( 'IXR_Error', $results );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach( $results as $result ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -56,19 +55,154 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_number_filter() {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->make_user_by_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $filter = array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $results = $this->myxmlrpcserver->wp_getComments( array( 1, 'editor', 'editor', array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_id' => $this->post_id,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- );
- $results = $this->myxmlrpcserver->wp_getComments( array( 1, 'editor', 'editor', $filter ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotInstanceOf( 'IXR_Error', $results );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // if no 'number' filter is specified, default should be 10
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( 10, count( $results ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertCount( 10, $results );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // explicitly set a 'number' filter and verify that only that many are returned
- $filter['number'] = 5;
- $results2 = $this->myxmlrpcserver->wp_getComments( array( 1, 'editor', 'editor', $filter ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $results2 = $this->myxmlrpcserver->wp_getComments( array( 1, 'editor', 'editor', array(
+ 'post_id' => $this->post_id,
+ 'number' => 5
+ ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotInstanceOf( 'IXR_Error', $results2 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( 5, count( $results2 ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertCount( 5, $results2 );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ function test_contributor_capabilities() {
+ $this->make_user_by_role( 'contributor' );
+ $author_id = $this->make_user_by_role( 'author' );
+ $author_post_id = $this->factory->post->create( array(
+ 'post_title' => 'Author',
+ 'post_author' => $author_id,
+ 'post_status' => 'publish'
+ ) );
+
+ $this->factory->comment->create( array(
+ 'comment_post_ID' => $author_post_id,
+ 'comment_author' => "Commenter 1",
+ 'comment_author_url' => "http://example.com/1/",
+ 'comment_approved' => 0,
+ ) );
+
+ $editor_id = $this->make_user_by_role( 'editor' );
+ $editor_post_id = $this->factory->post->create( array(
+ 'post_title' => 'Editor',
+ 'post_author' => $editor_id,
+ 'post_status' => 'publish'
+ ) );
+
+ $this->factory->comment->create( array(
+ 'comment_post_ID' => $editor_post_id,
+ 'comment_author' => 'Commenter 2',
+ 'comment_author_url' => 'http://example.com/2/',
+ 'comment_approved' => 0,
+ ) );
+
+ $result = $this->myxmlrpcserver->wp_getComments( array( 1, 'contributor', 'contributor' ) );
+ $this->assertInstanceOf( 'IXR_Error', $result );
+ $this->assertEquals( 401, $result->code );
+ }
+
+ function test_author_capabilities() {
+ $author_id = $this->make_user_by_role( 'author' );
+ $author_post_id = $this->factory->post->create( array(
+ 'post_title' => 'Author',
+ 'post_author' => $author_id,
+ 'post_status' => 'publish'
+ ) );
+
+ $this->factory->comment->create( array(
+ 'comment_post_ID' => $author_post_id,
+ 'comment_author' => 'Commenter 1',
+ 'comment_author_url' => 'http://example.com/1/',
+ 'comment_approved' => 1,
+ ) );
+
+ $editor_id = $this->make_user_by_role( 'editor' );
+ $editor_post_id = $this->factory->post->create( array(
+ 'post_title' => 'Editor',
+ 'post_author' => $editor_id,
+ 'post_status' => 'publish'
+ ) );
+
+ $this->factory->comment->create( array(
+ 'comment_post_ID' => $editor_post_id,
+ 'comment_author' => 'Commenter 2',
+ 'comment_author_url' => 'http://example.com/2/',
+ 'comment_approved' => 0,
+ ) );
+
+ $result1 = $this->myxmlrpcserver->wp_getComments( array( 1, 'author', 'author', array(
+ 'post_id' => $author_post_id
+ ) ) );
+ $this->assertInstanceOf( 'IXR_Error', $result1 );
+
+ $result2 = $this->myxmlrpcserver->wp_getComments( array( 1, 'author', 'author', array(
+ 'status' => 'approve',
+ 'post_id' => $author_post_id
+ ) ) );
+
+ $this->assertInternalType( 'array', $result2 );
+ $this->assertCount( 1, $result2 );
+
+ $result3 = $this->myxmlrpcserver->wp_getComments( array( 1, 'author', 'author', array(
+ 'post_id' => $editor_post_id
+ ) ) );
+ $this->assertInstanceOf( 'IXR_Error', $result3 );
+
+ $result4 = $this->myxmlrpcserver->wp_getComments( array( 1, 'author', 'author', array(
+ 'status' => 'approve',
+ 'post_id' => $author_post_id
+ ) ) );
+
+ $this->assertInternalType( 'array', $result4 );
+ $this->assertCount( 1, $result4 );
+ }
+
+ function test_editor_capabilities() {
+ $author_id = $this->make_user_by_role( 'author' );
+ $author_post_id = $this->factory->post->create( array(
+ 'post_title' => 'Author',
+ 'post_author' => $author_id,
+ 'post_status' => 'publish'
+ ) );
+
+ $this->factory->comment->create( array(
+ 'comment_post_ID' => $author_post_id,
+ 'comment_author' => 'Commenter 1',
+ 'comment_author_url' => 'http://example.com/1/',
+ 'comment_approved' => 1,
+ ));
+
+ $editor_id = $this->make_user_by_role( 'editor' );
+ $editor_post_id = $this->factory->post->create( array(
+ 'post_title' => 'Editor',
+ 'post_author' => $editor_id,
+ 'post_status' => 'publish'
+ ) );
+
+ $this->factory->comment->create(array(
+ 'comment_post_ID' => $editor_post_id,
+ 'comment_author' => 'Commenter 2',
+ 'comment_author_url' => 'http://example.com/2/',
+ 'comment_approved' => 0,
+ ));
+
+ $result = $this->myxmlrpcserver->wp_getComments( array( 1, 'editor', 'editor', array(
+ 'post_id' => $author_post_id
+ ) ) );
+ $this->assertInternalType( 'array', $result );
+ $this->assertCount( 1, $result );
+
+ $result2 = $this->myxmlrpcserver->wp_getComments( array( 1, 'editor', 'editor', array(
+ 'status' => 'approve',
+ 'post_id' => $author_post_id
+ ) ) );
+
+ $this->assertInternalType( 'array', $result2 );
+ $this->assertCount( 1, $result2 );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre>
</div>
</div>
</body>
</html>