Changeset 33885

Timestamp:

09/03/2015 08:53:23 AM (9 years ago)

Author:

SergeyBiryukov

Message:

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

props ericlewis, kraftbj, lukecarbis, mrmist.
fixes #33679. see #14530.

Location:

trunk/src

Files:

• wp-admin/users.php (modified) (2 diffs)
• wp-includes/class-wp-xmlrpc-server.php (modified) (1 diff)

trunk/src/wp-admin/users.php

@@ -10 +10 @@
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
-if ( ! current_user_can( 'list_users' ) )
-    wp_die( __( 'Cheatin’ uh?' ), 403 );
+if ( ! current_user_can( 'list_users' ) ) {
+    wp_die(
+        '<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+        '<p>' . __( 'You are not allowed to browse users.' ) . '</p>',
+        403
+    );
+}
 
 $wp_list_table = _get_list_table('WP_Users_List_Table');
@@ -128 +133 @@
 
         // If the user doesn't already belong to the blog, bail.
-        if ( is_multisite() && !is_user_member_of_blog( $id ) )
-            wp_die( __( 'Cheatin&#8217; uh?' ), 403 );
+        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>',
+                403
+            );
+        }
 
         $user = get_userdata( $id );

trunk/src/wp-includes/class-wp-xmlrpc-server.php

@@ -2412 +2412 @@
 
         if ( ! current_user_can( 'list_users' ) )
-            return new IXR_Error( 401, __( 'Sorry, you cannot list users.' ) );
+            return new IXR_Error( 401, __( 'You are not allowed to browse users.' ) );
 
         $query = array( 'fields' => 'all_with_meta' );