From 55bb26c58ad97ad8421c635e7f7e55974451dd9c Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Thu, 3 Sep 2015 09:02:13 +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.

git-svn-id: https://develop.svn.wordpress.org/trunk@33888 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/network/site-users.php | 9 +++++++--
 src/wp-admin/users.php              | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/wp-admin/network/site-users.php b/src/wp-admin/network/site-users.php
index 6017e2bd42..9684a7041c 100644
--- a/src/wp-admin/network/site-users.php
+++ b/src/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/src/wp-admin/users.php b/src/wp-admin/users.php
index 982e1ef65f..67b027a306 100644
--- a/src/wp-admin/users.php
+++ b/src/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
 			);
 		}