WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge some strings in `wp-admin/upload.php` with existing strings with the same meaning. 

Props pavelevap.
Fixes #31727.
Built from https://develop.svn.wordpress.org/trunk@34797


git-svn-id: http://core.svn.wordpress.org/trunk@34762 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2015-10-03 13:57:27 +00:00
parent b38569a5fc
commit 6b71b2304b
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wp-admin/upload.php
View File

@ -128,7 +128,7 @@ if ( $doaction ) {
break; break;
foreach ( (array) $post_ids as $post_id ) { foreach ( (array) $post_ids as $post_id ) {
if ( !current_user_can( 'delete_post', $post_id ) ) if ( !current_user_can( 'delete_post', $post_id ) )
wp_die( __( 'You are not allowed to move this post to the trash.' ) ); wp_die( __( 'You are not allowed to move this item to the Trash.' ) );
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.' ) );
@ -140,7 +140,7 @@ if ( $doaction ) {
break; break;
foreach ( (array) $post_ids as $post_id ) { foreach ( (array) $post_ids as $post_id ) {
if ( !current_user_can( 'delete_post', $post_id ) ) if ( !current_user_can( 'delete_post', $post_id ) )
wp_die( __( 'You are not allowed to move this post out of the trash.' ) ); wp_die( __( 'You are not allowed to move this item out of the Trash.' ) );
if ( !wp_untrash_post( $post_id ) ) if ( !wp_untrash_post( $post_id ) )
wp_die( __( 'Error in restoring from Trash.' ) ); wp_die( __( 'Error in restoring from Trash.' ) );
@ -152,7 +152,7 @@ if ( $doaction ) {
break; break;
foreach ( (array) $post_ids as $post_id_del ) { foreach ( (array) $post_ids as $post_id_del ) {
if ( !current_user_can( 'delete_post', $post_id_del ) ) if ( !current_user_can( 'delete_post', $post_id_del ) )
wp_die( __( 'You are not allowed to delete this post.' ) ); wp_die( __( 'You are not allowed to delete this item.' ) );
if ( !wp_delete_attachment( $post_id_del ) ) if ( !wp_delete_attachment( $post_id_del ) )
wp_die( __( 'Error in deleting.' ) ); wp_die( __( 'Error in deleting.' ) );

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.4-alpha-34796'; $wp_version = '4.4-alpha-34797';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.