From ea39c3073716bc8123b2c2db064ebf697fdd0965 Mon Sep 17 00:00:00 2001
From: markjaquith <markjaquith@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Fri, 28 May 2010 16:02:58 +0000
Subject: [PATCH] Backport [15032] to the 2.9 branch

git-svn-id: http://svn.automattic.com/wordpress/branches/2.9@15033 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/post.php     | 4 +++-
 wp-admin/includes/template.php | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/wp-admin/includes/post.php b/wp-admin/includes/post.php
index e5924f1dd9..78b768fbaf 100644
--- a/wp-admin/includes/post.php
+++ b/wp-admin/includes/post.php
@@ -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;
 		}
diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php
index 39f703a252..30422d619f 100644
--- a/wp-admin/includes/template.php
+++ b/wp-admin/includes/template.php
@@ -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':