From bc8af88903582e527981b61d806457e512f0b797 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Thu, 3 Sep 2015 09:03:24 +0000
Subject: [PATCH] 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
---
 wp-admin/network/site-users.php | 9 +++++++--
 wp-admin/users.php              | 2 +-
 wp-includes/version.php         | 2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/wp-admin/network/site-users.php b/wp-admin/network/site-users.php
index 6017e2bd42..9684a7041c 100644
--- a/wp-admin/network/site-users.php
+++ b/wp-admin/network/site-users.php
@@ -136,8 +136,13 @@ if ( $action ) {
 					$user_id = (int) $user_id;
 
 					// If the user doesn't already belong to the blog, bail.
-					if ( !is_user_member_of_blog( $user_id ) )
-						wp_die( __( 'Cheatin&#8217; uh?' ), 403 );
+					if ( ! is_user_member_of_blog( $user_id ) ) {
+						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->set_role( $_REQUEST['new_role'] );
diff --git a/wp-admin/users.php b/wp-admin/users.php
index 982e1ef65f..67b027a306 100644
--- a/wp-admin/users.php
+++ b/wp-admin/users.php
@@ -135,7 +135,7 @@ case 'promote':
 		if ( is_multisite() && !is_user_member_of_blog( $id ) ) {
 			wp_die(
 				'<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
 			);
 		}
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 473213cacd..c232e4898e 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @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.