Backport [15032] to the 2.9 branch

git-svn-id: http://svn.automattic.com/wordpress/branches/2.9@15033 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
markjaquith 2010-05-28 16:02:58 +00:00
parent 46ec8f7902
commit ea39c30737
2 changed files with 4 additions and 2 deletions

View File

@ -283,7 +283,9 @@ function bulk_edit_posts( $post_data = null ) {
$updated = $skipped = $locked = array();
foreach ( $post_IDs as $post_ID ) {
if ( isset($children) && in_array($post_ID, $children) ) {
$edit_cap = ( get_post_type( $post_ID ) == 'page' ) ? 'edit_page' : 'edit_post';
if ( ( isset($children) && in_array($post_ID, $children) ) || !current_user_can( $edit_cap, $post_ID ) ) {
$skipped[] = $post_ID;
continue;
}

View File

@ -1623,7 +1623,7 @@ foreach ($posts_columns as $column_name=>$column_display_name) {
case 'cb':
?>
<th scope="row" class="check-column"><input type="checkbox" name="post[]" value="<?php the_ID(); ?>" /></th>
<th scope="row" class="check-column"><?php if ( current_user_can( 'edit_page', $page->ID ) ) { ?><input type="checkbox" name="post[]" value="<?php the_ID(); ?>" /><?php } ?></th>
<?php
break;
case 'date':