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

Text Changes: Unify permission error messages in `wp-admin/users.php`. 

Props ramiy.
Fixes #38804.
Built from https://develop.svn.wordpress.org/trunk@39258


git-svn-id: http://core.svn.wordpress.org/trunk@39198 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2016-11-15 22:25:30 +00:00
parent 07cf16f7ba
commit a7af7c89a4
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
wp-admin/users.php
View File

@ -94,7 +94,7 @@ case 'promote':
check_admin_referer('bulk-users'); check_admin_referer('bulk-users');
if ( ! current_user_can( 'promote_users' ) ) if ( ! current_user_can( 'promote_users' ) )
wp_die( __( 'You can’t edit that user.' ) ); wp_die( __( 'Sorry, you are not allowed to edit that user.' ) );
if ( empty($_REQUEST['users']) ) { if ( empty($_REQUEST['users']) ) {
wp_redirect($redirect); wp_redirect($redirect);
@ -110,7 +110,7 @@ case 'promote':
} }
if ( ! $role || empty( $editable_roles[ $role ] ) ) { if ( ! $role || empty( $editable_roles[ $role ] ) ) {
wp_die( __( 'You can’t give users that role.' ) ); wp_die( __( 'Sorry, you are not allowed to give users that role.' ) );
} }
$userids = $_REQUEST['users']; $userids = $_REQUEST['users'];
@ -119,7 +119,7 @@ case 'promote':
$id = (int) $id; $id = (int) $id;
if ( ! current_user_can('promote_user', $id) ) if ( ! current_user_can('promote_user', $id) )
wp_die(__('You can’t edit that user.')); wp_die(__('Sorry, you are not allowed to edit that user.'));
// The new role of the current user must also have the promote_users cap or be a multisite super admin // The new role of the current user must also have the promote_users cap or be a multisite super admin
if ( $id == $current_user->ID && ! $wp_roles->role_objects[ $role ]->has_cap('promote_users') if ( $id == $current_user->ID && ! $wp_roles->role_objects[ $role ]->has_cap('promote_users')
&& ! ( is_multisite() && is_super_admin() ) ) { && ! ( is_multisite() && is_super_admin() ) ) {
@ -164,14 +164,14 @@ case 'dodelete':
} }
if ( ! current_user_can( 'delete_users' ) ) if ( ! current_user_can( 'delete_users' ) )
wp_die(__('You can’t delete users.')); wp_die(__('Sorry, you are not allowed to delete users.'));
$update = 'del'; $update = 'del';
$delete_count = 0; $delete_count = 0;
foreach ( $userids as $id ) { foreach ( $userids as $id ) {
if ( ! current_user_can( 'delete_user', $id ) ) if ( ! current_user_can( 'delete_user', $id ) )
wp_die(__( 'You can’t delete that user.' ) ); wp_die(__( 'Sorry, you are not allowed to delete that user.' ) );
if ( $id == $current_user->ID ) { if ( $id == $current_user->ID ) {
$update = 'err_admin_del'; $update = 'err_admin_del';
@ -204,7 +204,7 @@ case 'delete':
} }
if ( ! current_user_can( 'delete_users' ) ) if ( ! current_user_can( 'delete_users' ) )
$errors = new WP_Error( 'edit_users', __( 'You can’t delete users.' ) ); $errors = new WP_Error( 'edit_users', __( 'Sorry, you are not allowed to delete users.' ) );
if ( empty($_REQUEST['users']) ) if ( empty($_REQUEST['users']) )
$userids = array( intval( $_REQUEST['user'] ) ); $userids = array( intval( $_REQUEST['user'] ) );
@ -314,7 +314,7 @@ case 'doremove':
} }
if ( ! current_user_can( 'remove_users' ) ) if ( ! current_user_can( 'remove_users' ) )
wp_die( __( 'You can’t remove users.' ) ); wp_die( __( 'Sorry, you are not allowed to remove users.' ) );
$userids = $_REQUEST['users']; $userids = $_REQUEST['users'];
@ -349,7 +349,7 @@ case 'remove':
} }
if ( !current_user_can('remove_users') ) if ( !current_user_can('remove_users') )
$error = new WP_Error('edit_users', __('You can’t remove users.')); $error = new WP_Error('edit_users', __('Sorry, you are not allowed to remove users.'));
if ( empty($_REQUEST['users']) ) if ( empty($_REQUEST['users']) )
$userids = array(intval($_REQUEST['user'])); $userids = array(intval($_REQUEST['user']));

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.7-beta3-39257'; $wp_version = '4.7-beta3-39258';
/** /**
* 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.