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

Don't check post_type_supports in map_meta_cap. see #14122. 

git-svn-id: http://svn.automattic.com/wordpress/trunk@16422 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
nacin 2010-11-17 06:21:34 +00:00
parent aef807694c
commit e5f944a913
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
wp-includes/capabilities.php
View File

@ -831,11 +831,10 @@ function map_meta_cap( $cap, $user_id ) {
break; break;
} }
if ( '' != $post->post_author && post_type_supports( $post_type->name, 'author' ) ) { if ( '' != $post->post_author ) {
$post_author_data = get_userdata( $post->post_author ); $post_author_data = get_userdata( $post->post_author );
} else { } else {
// No author set yet or post type doesn't support authors, // No author set yet, so default to current user for cap checks.
// so default to current user for cap checks.
$post_author_data = $author_data; $post_author_data = $author_data;
} }
@ -874,11 +873,10 @@ function map_meta_cap( $cap, $user_id ) {
break; break;
} }
if ( '' != $post->post_author && post_type_supports( $post_type->name, 'author' ) ) { if ( '' != $post->post_author ) {
$post_author_data = get_userdata( $post->post_author ); $post_author_data = get_userdata( $post->post_author );
} else { } else {
// No author set yet or post type doesn't support authors, // No author set yet, so default to current user for cap checks.
// so default to current user for cap checks.
$post_author_data = $author_data; $post_author_data = $author_data;
} }
@ -921,11 +919,10 @@ function map_meta_cap( $cap, $user_id ) {
break; break;
} }
if ( '' != $post->post_author && post_type_supports( $post_type->name, 'author' ) ) { if ( '' != $post->post_author ) {
$post_author_data = get_userdata( $post->post_author ); $post_author_data = get_userdata( $post->post_author );
} else { } else {
// No author set yet or post type doesn't support authors, // No author set yet, so default to current user for cap checks.
// so default to current user for cap checks.
$post_author_data = $author_data; $post_author_data = $author_data;
} }

3
wp-includes/post.php
View File

@ -1086,7 +1086,8 @@ function get_post_type_capabilities( $args ) {
} }
if ( ! post_type_supports( $args->name, 'author' ) ) { if ( ! post_type_supports( $args->name, 'author' ) ) {
// While these may be checked in core, users/roles shouldn't need to be granted these. // While these may be checked in core, users/roles shouldn't need to be
// granted these by default if the post type doesn't support authors.
$default_capabilities['edit_others_posts'] = $default_capabilities['edit_posts']; $default_capabilities['edit_others_posts'] = $default_capabilities['edit_posts'];
if ( $args->map_meta_cap ) if ( $args->map_meta_cap )
$default_capabilities['delete_others_posts'] = $default_capabilities['delete_posts']; $default_capabilities['delete_others_posts'] = $default_capabilities['delete_posts'];