Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2025-01-03 15:08:10 +01:00
Code Issues Projects Releases Wiki Activity

Merge duplicate strings related to Trash.

Browse Source 
props pavelevap.
fixes #33133.
Built from https://develop.svn.wordpress.org/trunk@33431


git-svn-id: http://core.svn.wordpress.org/trunk@33398 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2015-07-26 22:48:26 +00:00
parent a92b1d02ae
commit 82034319e1
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
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
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;

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.3-beta4-33430';
$wp_version = '4.3-beta4-33431';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.