Changeset 39348 for trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-users-controller.php

Timestamp:

11/23/2016 03:32:25 PM (8 years ago)

Author:

rachelbaker

Message:

REST API: Always fire the rest_insert_* actions after the related object is updated or inserted.

Brings consistency to the rest_insert_* actions. Also includes some shuffling and clean-up as well including:

• Ensure we are passing the most current $post and $user objects to the update_additional_fields_for_object() callbacks.
• Changes the function signature of handle_status_param() in the Comments controller to accept just the comment_id as the 2nd parameter, instead of a full WP_Comment object. Only the comment_id is needed in the method, this avoids having to include another get_comment() call.
• Renames a variable in the create_item() method of the Posts controller from $post -> $prepared_post to be more explicit.
• Minor fixes/clarifications to the rest_insert_* hook docs

Props rachelbaker, joehoyle
Fixes #38905.

File:

• trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-users-controller.php (modified) (5 diffs)

trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-users-controller.php

@@ -462 +462 @@
         $user = get_user_by( 'id', $user_id );
 
-        if ( ! empty( $request['roles'] ) && ! empty( $schema['properties']['roles'] ) ) {
-            array_map( array( $user, 'add_role' ), $request['roles'] );
-        }
-
-        if ( ! empty( $schema['properties']['meta'] ) && isset( $request['meta'] ) ) {
-            $meta_update = $this->meta->update_value( $request['meta'], $user_id );
-
-            if ( is_wp_error( $meta_update ) ) {
-                return $meta_update;
-            }
-        }
-
-        $fields_update = $this->update_additional_fields_for_object( $user, $request );
-
-        if ( is_wp_error( $fields_update ) ) {
-            return $fields_update;
-        }
-
         /**
          * Fires immediately after a user is created or updated via the REST API.
@@ -485 +467 @@
          * @since 4.7.0
          *
-         * @param WP_User         $user     Data used to create the user.
+         * @param WP_User         $user     Inserted or updated user object.
          * @param WP_REST_Request $request  Request object.
-         * @param bool            $creating True when creating user, false when updating user.
+         * @param bool            $creating True when creating a user, false when updating.
          */
         do_action( 'rest_insert_user', $user, $request, true );
+
+        if ( ! empty( $request['roles'] ) && ! empty( $schema['properties']['roles'] ) ) {
+            array_map( array( $user, 'add_role' ), $request['roles'] );
+        }
+
+        if ( ! empty( $schema['properties']['meta'] ) && isset( $request['meta'] ) ) {
+            $meta_update = $this->meta->update_value( $request['meta'], $user_id );
+
+            if ( is_wp_error( $meta_update ) ) {
+                return $meta_update;
+            }
+        }
+
+        $user = get_user_by( 'id', $user_id );
+        $fields_update = $this->update_additional_fields_for_object( $user, $request );
+
+        if ( is_wp_error( $fields_update ) ) {
+            return $fields_update;
+        }
 
         $request->set_param( 'context', 'edit' );
@@ -574 +575 @@
         }
 
-        $user = get_user_by( 'id', $id );
+        $user = get_user_by( 'id', $user_id );
+
+        /* This action is documented in lib/endpoints/class-wp-rest-users-controller.php */
+        do_action( 'rest_insert_user', $user, $request, false );
 
         if ( is_multisite() && ! is_user_member_of_blog( $id ) ) {
@@ -594 +598 @@
         }
 
+        $user = get_user_by( 'id', $user_id );
         $fields_update = $this->update_additional_fields_for_object( $user, $request );
 
@@ -599 +604 @@
             return $fields_update;
         }
-
-        /* This action is documented in lib/endpoints/class-wp-rest-users-controller.php */
-        do_action( 'rest_insert_user', $user, $request, false );
 
         $request->set_param( 'context', 'edit' );