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 two permission error messages in `wp-admin/network/site-users.php`. 

Props ramiy.
Fixes #38178. See #34521.
Built from https://develop.svn.wordpress.org/trunk@38665


git-svn-id: http://core.svn.wordpress.org/trunk@38608 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2016-09-27 23:52:28 +00:00
parent 1084773c1c
commit ddd0456020
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
wp-admin/network/site-users.php
View File

@ -115,7 +115,7 @@ if ( $action ) {
case 'remove':
if ( ! current_user_can( 'remove_users' ) ) {
wp_die( __( 'You can’t remove users.' ) );
wp_die( __( 'Sorry, you are not allowed to remove users.' ) );
}
check_admin_referer( 'bulk-users' );
@ -138,8 +138,9 @@ if ( $action ) {
case 'promote':
check_admin_referer( 'bulk-users' );
$editable_roles = get_editable_roles();
if ( empty( $editable_roles[$_REQUEST['new_role']] ) )
wp_die(__('You can’t give users that role.'));
if ( empty( $editable_roles[ $_REQUEST['new_role'] ] ) ) {
wp_die( __( 'Sorry, you are not allowed to give users that role.' ) );
}
if ( isset( $_REQUEST['users'] ) ) {
$userids = $_REQUEST['users'];

2
wp-includes/version.php
View File

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