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

Provide more helpful feedback than just "Cheatin' uh?" for permission errors in `wp-admin/network/site-users.php`. 

props ericlewis, kraftbj, lukecarbis, mrmist.
fixes #33683. see #14530.
Built from https://develop.svn.wordpress.org/trunk@33888


git-svn-id: http://core.svn.wordpress.org/trunk@33857 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2015-09-03 09:03:24 +00:00
parent 771b29455b
commit bc8af88903
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -136,8 +136,13 @@ if ( $action ) {
$user_id = (int) $user_id; $user_id = (int) $user_id;
// If the user doesn't already belong to the blog, bail. // If the user doesn't already belong to the blog, bail.
if ( !is_user_member_of_blog( $user_id ) ) if ( ! is_user_member_of_blog( $user_id ) ) {
wp_die( __( 'Cheatin’ uh?' ), 403 ); wp_die(
'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
'<p>' . __( 'One of the selected users is not a member of this site.' ) . '</p>',
403
);
}
$user = get_userdata( $user_id ); $user = get_userdata( $user_id );
$user->set_role( $_REQUEST['new_role'] ); $user->set_role( $_REQUEST['new_role'] );

2
wp-admin/users.php
View File

@ -135,7 +135,7 @@ case 'promote':
if ( is_multisite() && !is_user_member_of_blog( $id ) ) { if ( is_multisite() && !is_user_member_of_blog( $id ) ) {
wp_die( wp_die(
'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' . '<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
'<p>' . __( 'One of the selected users in not a member of this site.' ) . '</p>', '<p>' . __( 'One of the selected users is not a member of this site.' ) . '</p>',
403 403
); );
} }

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.4-alpha-33887'; $wp_version = '4.4-alpha-33888';
/** /**
* 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.