From ef4e893fafbb2096999db2ceaf58b2e9f9badfc8 Mon Sep 17 00:00:00 2001 From: Tonya Mork Date: Mon, 13 Feb 2023 23:08:23 +0000 Subject: [PATCH] REST API: Remove 'Invalid user ID' error in WP_REST_Users_Controller::update_item(). Removes the `WP_Error` code for `'Invalid user ID.'`. Why? tl;dr This branch will never be entered as the `$user` will never be falsey. Longer reasoning: [39954] introduced `WP_REST_Users_Controller::get_user()` method to encapsulate getting the user and handling the `'Invalid user ID.'` `WP_Error`. It replaced `get_userdata()` in `WP_REST_Users_Controller::update_item()` but left the existing `'Invalid user ID.'` `WP_Error` introduced in [38832]. The code removed in this changeset will never be reached because `$user` will never be falsey. Rather, `WP_REST_Users_Controller::get_user()` will always return an instance of `WP_Error` or `WP_User`. Could the user's ID be falsey? No. Why? `WP_REST_Users_Controller::get_user()` checks that the user exists, which checks if the ID is falsey. Therefore, the code can safely be removed. Follow-up to [39954], [38832]. Props jrf, costdev, hellofromTonya, SergeyBiryukov. Fixes #56662. git-svn-id: https://develop.svn.wordpress.org/trunk@55325 602fd350-edb4-49c9-b593-d223f7449a82 --- .../rest-api/endpoints/class-wp-rest-users-controller.php | 8 -------- 1 file changed, 8 deletions(-) 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 index 62b9bc7e5d..aaa4c1a3aa 100644 --- 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 @@ -717,14 +717,6 @@ class WP_REST_Users_Controller extends WP_REST_Controller { $id = $user->ID; - if ( ! $user ) { - return new WP_Error( - 'rest_user_invalid_id', - __( 'Invalid user ID.' ), - array( 'status' => 404 ) - ); - } - $owner_id = false; if ( is_string( $request['email'] ) ) { $owner_id = email_exists( $request['email'] );