WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Ensure that we always check the right cap when posts are added or edited. 

git-svn-id: http://svn.automattic.com/wordpress/trunk@16798 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
westi 2010-12-08 15:31:17 +00:00
parent 5cce49e2b7
commit 183e561585
1 changed files with 48 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
wp-includes/class-wp-xmlrpc-server.php
View File

@ -2080,30 +2080,48 @@ class wp_xmlrpc_server extends IXR_Server {
$username = $args[1]; $username = $args[1];
$password = $args[2]; $password = $args[2];
$content_struct = $args[3]; $content_struct = $args[3];
$publish = $args[4]; $publish = isset( $args[4] ) ? $args[4] : 0;
if ( !$user = $this->login($username, $password) ) if ( !$user = $this->login($username, $password) )
return $this->error; return $this->error;
do_action('xmlrpc_call', 'metaWeblog.newPost'); do_action('xmlrpc_call', 'metaWeblog.newPost');
$cap = ( $publish ) ? 'publish_posts' : 'edit_posts';
$error_message = __( 'Sorry, you are not allowed to publish posts on this site.' );
$post_type = 'post';
$page_template = ''; $page_template = '';
if ( !empty( $content_struct['post_type'] ) ) { if ( !empty( $content_struct['post_type'] ) ) {
if ( $content_struct['post_type'] == 'page' ) { if ( $content_struct['post_type'] == 'page' ) {
$cap = ( $publish ) ? 'publish_pages' : 'edit_pages'; if ( $publish )
$cap = 'publish_pages';
elseif ('publish' == $content_struct['page_status'])
$cap = 'publish_pages';
else
$cap = 'edit_pages';
$error_message = __( 'Sorry, you are not allowed to publish pages on this site.' ); $error_message = __( 'Sorry, you are not allowed to publish pages on this site.' );
$post_type = 'page'; $post_type = 'page';
if ( !empty( $content_struct['wp_page_template'] ) ) if ( !empty( $content_struct['wp_page_template'] ) )
$page_template = $content_struct['wp_page_template']; $page_template = $content_struct['wp_page_template'];
} elseif ( $content_struct['post_type'] == 'post' ) { } elseif ( $content_struct['post_type'] == 'post' ) {
// This is the default, no changes needed 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';
} else { } else {
// No other post_type values are allowed here // No other post_type values are allowed here
return new IXR_Error( 401, __( 'Invalid post type.' ) ); return new IXR_Error( 401, __( 'Invalid post type.' ) );
} }
} 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';
} }
if ( !current_user_can( $cap ) ) if ( !current_user_can( $cap ) )
@ -2381,17 +2399,38 @@ class wp_xmlrpc_server extends IXR_Server {
$page_template = ''; $page_template = '';
if ( !empty( $content_struct['post_type'] ) ) { if ( !empty( $content_struct['post_type'] ) ) {
if ( $content_struct['post_type'] == 'page' ) { if ( $content_struct['post_type'] == 'page' ) {
$cap = ( $publish ) ? 'publish_pages' : 'edit_pages'; if ( $publish )
$cap = 'publish_pages';
elseif ('publish' == $content_struct['page_status'])
$cap = 'publish_pages';
else
$cap = 'edit_pages';
$error_message = __( 'Sorry, you are not allowed to publish pages on this site.' ); $error_message = __( 'Sorry, you are not allowed to publish pages on this site.' );
$post_type = 'page'; $post_type = 'page';
if ( !empty( $content_struct['wp_page_template'] ) ) if ( !empty( $content_struct['wp_page_template'] ) )
$page_template = $content_struct['wp_page_template']; $page_template = $content_struct['wp_page_template'];
} elseif ( $content_struct['post_type'] == 'post' ) { } elseif ( $content_struct['post_type'] == 'post' ) {
// This is the default, no changes needed 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';
} else { } else {
// No other post_type values are allowed here // No other post_type values are allowed here
return new IXR_Error( 401, __( 'Invalid post type.' ) ); return new IXR_Error( 401, __( 'Invalid post type.' ) );
} }
} 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';
} }
if ( !current_user_can( $cap ) ) if ( !current_user_can( $cap ) )