mirror_php/wordpress
1
0
Fork 0
mirror of git://develop.git.wordpress.org/ synced 2025-03-15 01:19:51 +01:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge duplicate strings related to Trash.

Browse Source 
props pavelevap.
fixes #33133.

git-svn-id: https://develop.svn.wordpress.org/trunk@33431 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Sergey Biryukov 2015-07-26 22:47:05 +00:00
parent a5d922f427
commit 5a23543cc8
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/wp-admin/post.php
View File

@ -278,7 +278,7 @@ case 'untrash':
wp_die( __( 'Unknown post type.' ) );
if ( ! current_user_can( 'delete_post', $post_id ) )
wp_die( __( 'You are not allowed to move this item out of the Trash.' ) );
wp_die( __( 'You are not allowed to restore this item from the Trash.' ) );
if ( ! wp_untrash_post( $post_id ) )
wp_die( __( 'Error in restoring from Trash.' ) );

4
src/wp-admin/upload.php
View File

@ -129,7 +129,7 @@ if ( $doaction ) {
wp_die( __( 'You are not allowed to move this post to the trash.' ) );
if ( !wp_trash_post( $post_id ) )
wp_die( __( 'Error in moving to trash.' ) );
wp_die( __( 'Error in moving to Trash.' ) );
}
$location = add_query_arg( array( 'trashed' => count( $post_ids ), 'ids' => join( ',', $post_ids ) ), $location );
break;
@ -141,7 +141,7 @@ if ( $doaction ) {
wp_die( __( 'You are not allowed to move this post out of the trash.' ) );
if ( !wp_untrash_post( $post_id ) )
wp_die( __( 'Error in restoring from trash.' ) );
wp_die( __( 'Error in restoring from Trash.' ) );
}
$location = add_query_arg( 'untrashed', count( $post_ids ), $location );
break;