Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2025-01-05 07:58:35 +01:00
Code Issues Projects Releases Wiki Activity

Bulk actions: do not move locked posts to the trash, props pdclark, see #23792

Browse Source 
git-svn-id: http://core.svn.wordpress.org/trunk@23747 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Ozz 2013-03-18 21:11:06 +00:00
parent e3590b9637
commit 043d31609f
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
wp-admin/edit.php
View File

@ -48,7 +48,7 @@ $doaction = $wp_list_table->current_action();
if ( $doaction ) { if ( $doaction ) {
check_admin_referer('bulk-posts'); check_admin_referer('bulk-posts');
$sendback = remove_query_arg( array('trashed', 'untrashed', 'deleted', 'ids'), wp_get_referer() ); $sendback = remove_query_arg( array('trashed', 'untrashed', 'deleted', 'locked', 'ids'), wp_get_referer() );
if ( ! $sendback ) if ( ! $sendback )
$sendback = admin_url( $parent_file ); $sendback = admin_url( $parent_file );
$sendback = add_query_arg( 'paged', $pagenum, $sendback ); $sendback = add_query_arg( 'paged', $pagenum, $sendback );
@ -75,17 +75,24 @@ if ( $doaction ) {
switch ( $doaction ) { switch ( $doaction ) {
case 'trash': case 'trash':
$trashed = 0; $trashed = $locked = 0;
foreach( (array) $post_ids as $post_id ) { foreach( (array) $post_ids as $post_id ) {
if ( !current_user_can($post_type_object->cap->delete_post, $post_id) ) if ( !current_user_can($post_type_object->cap->delete_post, $post_id) )
wp_die( __('You are not allowed to move this item to the Trash.') ); wp_die( __('You are not allowed to move this item to the Trash.') );
if ( wp_check_post_lock( $post_id ) ) {
$locked++;
continue;
}
if ( !wp_trash_post($post_id) ) if ( !wp_trash_post($post_id) )
wp_die( __('Error in moving to Trash.') ); wp_die( __('Error in moving to Trash.') );
$trashed++; $trashed++;
} }
$sendback = add_query_arg( array('trashed' => $trashed, 'ids' => join(',', $post_ids) ), $sendback );
$sendback = add_query_arg( array('trashed' => $trashed, 'ids' => join(',', $post_ids), 'locked' => $locked ), $sendback );
break; break;
case 'untrash': case 'untrash':
$untrashed = 0; $untrashed = 0;