vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-06-28 22:30:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Trash should always be in titlecase for consistency

Browse Source 
git-svn-id: https://develop.svn.wordpress.org/trunk@14167 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Nikolay Bachiyski
2010-04-20 14:54:36 +00:00
parent 47536f1eee
commit 0cab071f77
3 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
wp-admin/post.php
View File

@@ -218,10 +218,10 @@ case 'trash':
$post = & get_post($post_id);
if ( !current_user_can($post_type_object->delete_cap, $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_trash_post($post_id) )
wp_die( __('Error in moving to trash...') );
wp_die( __('Error in moving to Trash.') );
wp_redirect( add_query_arg( array('trashed' => 1, 'ids' => $post_id), $sendback ) );
exit();
@@ -231,10 +231,10 @@ case 'untrash':
check_admin_referer('untrash-' . $post_type . '_' . $post_id);
if ( !current_user_can($post_type_object->delete_cap, $post_id) )
wp_die( __('You are not allowed to move this item out of the trash.') );
wp_die( __('You are not allowed to move this item out of the Trash.') );
if ( ! wp_untrash_post($post_id) )
wp_die( __('Error in restoring from trash...') );
wp_die( __('Error in restoring from Trash.') );
wp_redirect( add_query_arg('untrashed', 1, $sendback) );
exit();
@@ -250,10 +250,10 @@ case 'delete':
if ( $post->post_type == 'attachment' ) {
$force = ( $force || !MEDIA_TRASH );
if ( ! wp_delete_attachment($post_id, $force) )
wp_die( __('Error in deleting...') );
wp_die( __('Error in deleting.') );
} else {
if ( !wp_delete_post($post_id, $force) )
wp_die( __('Error in deleting...') );
wp_die( __('Error in deleting.') );
}
wp_redirect( add_query_arg('deleted', 1, $sendback) );