Text Changes: Merge strings referring to list_users capability.

SergeyBiryukov · SergeyBiryukov · commit 4e5fdda8f9a8 · 2016-11-19T02:15:10.000Z
See #38857. git-svn-id: https://develop.svn.wordpress.org/trunk@39312 602fd350-edb4-49c9-b593-d223f7449a82
diff --git a/src/wp-admin/users.php b/src/wp-admin/users.php
@@ -13,7 +13,7 @@
 if ( ! current_user_can( 'list_users' ) ) {
 	wp_die(
 		'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
-		'<p>' . __( 'Sorry, you are not allowed to browse users.' ) . '</p>',
+		'<p>' . __( 'Sorry, you are not allowed to list users.' ) . '</p>',
 		403
 	);
 }
diff --git a/src/wp-includes/class-wp-xmlrpc-server.php b/src/wp-includes/class-wp-xmlrpc-server.php
@@ -2476,7 +2476,7 @@ public function wp_getUsers( $args ) {
 		do_action( 'xmlrpc_call', 'wp.getUsers' );
 
 		if ( ! current_user_can( 'list_users' ) )
-			return new IXR_Error( 401, __( 'Sorry, you are not allowed to browse users.' ) );
+			return new IXR_Error( 401, __( 'Sorry, you are not allowed to list users.' ) );
 
 		$query = array( 'fields' => 'all_with_meta' );
 
diff --git a/src/wp-includes/rest-api/endpoints/class-wp-rest-users-controller.php b/src/wp-includes/rest-api/endpoints/class-wp-rest-users-controller.php
@@ -148,7 +148,7 @@ public function get_items_permissions_check( $request ) {
 		}
 
 		if ( 'edit' === $request['context'] && ! current_user_can( 'list_users' ) ) {
-			return new WP_Error( 'rest_forbidden_context', __( 'Sorry, you are not allowed to edit users.' ), array( 'status' => rest_authorization_required_code() ) );
+			return new WP_Error( 'rest_forbidden_context', __( 'Sorry, you are not allowed to list users.' ), array( 'status' => rest_authorization_required_code() ) );
 		}
 
 		if ( in_array( $request['orderby'], array( 'email', 'registered_date' ), true ) && ! current_user_can( 'list_users' ) ) {

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`if ( ! current_user_can( 'list_users' ) ) {`
`14`	`14`	`wp_die(`
`15`	`15`	`'<h1>' . __( 'Cheatin’ uh?' ) . '</h1>' .`
`16`		`- '<p>' . __( 'Sorry, you are not allowed to browse users.' ) . '</p>',`
	`16`	`+ '<p>' . __( 'Sorry, you are not allowed to list users.' ) . '</p>',`
`17`	`17`	`403`
`18`	`18`	`);`
`19`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ public function get_items_permissions_check( $request ) {`
`148`	`148`	`}`
`149`	`149`
`150`	`150`	`if ( 'edit' === $request['context'] && ! current_user_can( 'list_users' ) ) {`
`151`		`- return new WP_Error( 'rest_forbidden_context', __( 'Sorry, you are not allowed to edit users.' ), array( 'status' => rest_authorization_required_code() ) );`
	`151`	`+ return new WP_Error( 'rest_forbidden_context', __( 'Sorry, you are not allowed to list users.' ), array( 'status' => rest_authorization_required_code() ) );`
`152`	`152`	`}`
`153`	`153`
`154`	`154`	`if ( in_array( $request['orderby'], array( 'email', 'registered_date' ), true ) && ! current_user_can( 'list_users' ) ) {`