<!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>[16798] trunk/wp-includes/class-wp-xmlrpc-server.php:
Ensure that we always check the right cap when posts are added or edited.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16798">16798</a></dd>
<dt>Author</dt> <dd>westi</dd>
<dt>Date</dt> <dd>2010-12-08 15:31:17 +0000 (Wed, 08 Dec 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Ensure that we always check the right cap when posts are added or edited.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesclasswpxmlrpcserverphp">trunk/wp-includes/class-wp-xmlrpc-server.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesclasswpxmlrpcserverphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class-wp-xmlrpc-server.php (16797 => 16798)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-wp-xmlrpc-server.php 2010-12-08 11:04:40 UTC (rev 16797)
+++ trunk/wp-includes/class-wp-xmlrpc-server.php 2010-12-08 15:31:17 UTC (rev 16798)
</span><span class="lines">@@ -2080,30 +2080,48 @@
</span><span class="cx"> $username = $args[1];
</span><span class="cx"> $password = $args[2];
</span><span class="cx"> $content_struct = $args[3];
</span><del>- $publish = $args[4];
</del><ins>+ $publish = isset( $args[4] ) ? $args[4] : 0;
</ins><span class="cx">
</span><span class="cx"> if ( !$user = $this->login($username, $password) )
</span><span class="cx"> return $this->error;
</span><span class="cx">
</span><span class="cx"> do_action('xmlrpc_call', 'metaWeblog.newPost');
</span><del>-
- $cap = ( $publish ) ? 'publish_posts' : 'edit_posts';
- $error_message = __( 'Sorry, you are not allowed to publish posts on this site.' );
- $post_type = 'post';
</del><ins>+
</ins><span class="cx"> $page_template = '';
</span><span class="cx"> if ( !empty( $content_struct['post_type'] ) ) {
</span><span class="cx"> if ( $content_struct['post_type'] == 'page' ) {
</span><del>- $cap = ( $publish ) ? 'publish_pages' : 'edit_pages';
</del><ins>+ if ( $publish )
+ $cap = 'publish_pages';
+ elseif ('publish' == $content_struct['page_status'])
+ $cap = 'publish_pages';
+ else
+ $cap = 'edit_pages';
</ins><span class="cx"> $error_message = __( 'Sorry, you are not allowed to publish pages on this site.' );
</span><span class="cx"> $post_type = 'page';
</span><span class="cx"> if ( !empty( $content_struct['wp_page_template'] ) )
</span><span class="cx"> $page_template = $content_struct['wp_page_template'];
</span><span class="cx"> } elseif ( $content_struct['post_type'] == 'post' ) {
</span><del>- // This is the default, no changes needed
</del><ins>+ if ( $publish )
+ $cap = 'publish_posts';
+ elseif ('publish' == $content_struct['post_status'])
+ $cap = 'publish_posts';
+ else
+ $cap = 'edit_posts';
+ $error_message = __( 'Sorry, you are not allowed to publish posts on this site.' );
+ $post_type = 'post';
</ins><span class="cx"> } else {
</span><span class="cx"> // No other post_type values are allowed here
</span><span class="cx"> return new IXR_Error( 401, __( 'Invalid post type.' ) );
</span><span class="cx"> }
</span><ins>+ } else {
+ if ( $publish )
+ $cap = 'publish_posts';
+ elseif ('publish' == $content_struct['post_status'])
+ $cap = 'publish_posts';
+ else
+ $cap = 'edit_posts';
+ $error_message = __( 'Sorry, you are not allowed to publish posts on this site.' );
+ $post_type = 'post';
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( !current_user_can( $cap ) )
</span><span class="lines">@@ -2381,17 +2399,38 @@
</span><span class="cx"> $page_template = '';
</span><span class="cx"> if ( !empty( $content_struct['post_type'] ) ) {
</span><span class="cx"> if ( $content_struct['post_type'] == 'page' ) {
</span><del>- $cap = ( $publish ) ? 'publish_pages' : 'edit_pages';
</del><ins>+ if ( $publish )
+ $cap = 'publish_pages';
+ elseif ('publish' == $content_struct['page_status'])
+ $cap = 'publish_pages';
+ else
+ $cap = 'edit_pages';
</ins><span class="cx"> $error_message = __( 'Sorry, you are not allowed to publish pages on this site.' );
</span><span class="cx"> $post_type = 'page';
</span><span class="cx"> if ( !empty( $content_struct['wp_page_template'] ) )
</span><span class="cx"> $page_template = $content_struct['wp_page_template'];
</span><span class="cx"> } elseif ( $content_struct['post_type'] == 'post' ) {
</span><del>- // This is the default, no changes needed
</del><ins>+ if ( $publish )
+ $cap = 'publish_posts';
+ elseif ('publish' == $content_struct['post_status'])
+ $cap = 'publish_posts';
+ else
+ $cap = 'edit_posts';
+ $error_message = __( 'Sorry, you are not allowed to publish posts on this site.' );
+ $post_type = 'post';
</ins><span class="cx"> } else {
</span><span class="cx"> // No other post_type values are allowed here
</span><span class="cx"> return new IXR_Error( 401, __( 'Invalid post type.' ) );
</span><span class="cx"> }
</span><ins>+ } else {
+ if ( $publish )
+ $cap = 'publish_posts';
+ elseif ('publish' == $content_struct['post_status'])
+ $cap = 'publish_posts';
+ else
+ $cap = 'edit_posts';
+ $error_message = __( 'Sorry, you are not allowed to publish posts on this site.' );
+ $post_type = 'post';
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( !current_user_can( $cap ) )
</span></span></pre>
</div>
</div>
</body>
</html>