Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-12-23 09:37:42 +01:00
Code Issues Projects Releases Wiki Activity

Don't call get_userdata() every time for the current user in map_meta_cap()'s read_post, edit_post, and delete_post branches. see #21120.

Browse Source 
git-svn-id: http://core.svn.wordpress.org/trunk@21375 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
nacin 2012-07-31 17:39:14 +00:00
parent 996366cc0e
commit fcae3978c3
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
wp-includes/capabilities.php
View File

@ -960,7 +960,6 @@ function map_meta_cap( $cap, $user_id ) {
break;
case 'delete_post':
case 'delete_page':
$author_data = get_userdata( $user_id );
$post = get_post( $args[0] );
if ( 'revision' == $post->post_type ) {
@ -981,7 +980,7 @@ function map_meta_cap( $cap, $user_id ) {
$post_author_data = get_userdata( $post->post_author );
} else {
// No author set yet, so default to current user for cap checks.
$post_author_data = $author_data;
$post_author_data = get_userdata( $user_id );
}
// If the user is the author...
@ -1010,7 +1009,6 @@ function map_meta_cap( $cap, $user_id ) {
// edit_others_posts
case 'edit_post':
case 'edit_page':
$author_data = get_userdata( $user_id );
$post = get_post( $args[0] );
if ( 'revision' == $post->post_type ) {
@ -1031,7 +1029,7 @@ function map_meta_cap( $cap, $user_id ) {
$post_author_data = get_userdata( $post->post_author );
} else {
// No author set yet, so default to current user for cap checks.
$post_author_data = $author_data;
$post_author_data = get_userdata( $user_id );
}
//echo "current user id : $user_id, post author id: " . $post_author_data->ID . "<br />";
@ -1059,7 +1057,6 @@ function map_meta_cap( $cap, $user_id ) {
break;
case 'read_post':
case 'read_page':
$author_data = get_userdata( $user_id );
$post = get_post( $args[0] );
if ( 'revision' == $post->post_type ) {
@ -1086,7 +1083,7 @@ function map_meta_cap( $cap, $user_id ) {
$post_author_data = get_userdata( $post->post_author );
} else {
// No author set yet, so default to current user for cap checks.
$post_author_data = $author_data;
$post_author_data = get_userdata( $user_id );
}
if ( is_object( $post_author_data ) && $user_id == $post_author_data->ID )