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

Timestamp:

11/23/2016 03:32:25 PM (9 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-posts-controller.php (modified) (11 diffs)

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

@@ -483 +483 @@
         }
 
-        $post = $this->prepare_item_for_database( $request );
-
-        if ( is_wp_error( $post ) ) {
-            return $post;
-        }
-
-        $post->post_type = $this->post_type;
-        $post_id         = wp_insert_post( wp_slash( (array) $post ), true );
+        $prepared_post = $this->prepare_item_for_database( $request );
+
+        if ( is_wp_error( $prepared_post ) ) {
+            return $prepared_post;
+        }
+
+        $prepared_post->post_type = $this->post_type;
+
+        $post_id = wp_insert_post( wp_slash( (array) $prepared_post ), true );
 
         if ( is_wp_error( $post_id ) ) {
@@ -503 +504 @@
         }
 
-        $post->ID = $post_id;
+        $post = get_post( $post_id );
+
+        /**
+         * Fires after a single post is created or updated via the REST API.
+         *
+         * The dynamic portion of the hook name, `$this->post_type`, refers to the post type slug.
+         *
+         * @since 4.7.0
+         *
+         * @param WP_Post         $post     Inserted or updated post object.
+         * @param WP_REST_Request $request  Request object.
+         * @param bool            $creating True when creating a post, false when updating.
+         */
+        do_action( "rest_insert_{$this->post_type}", $post, $request, true );
 
         $schema = $this->get_item_schema();
@@ -516 +530 @@
 
         if ( ! empty( $schema['properties']['featured_media'] ) && isset( $request['featured_media'] ) ) {
-            $this->handle_featured_media( $request['featured_media'], $post->ID );
+            $this->handle_featured_media( $request['featured_media'], $post_id );
         }
 
@@ -524 +538 @@
 
         if ( ! empty( $schema['properties']['template'] ) && isset( $request['template'] ) ) {
-            $this->handle_template( $request['template'], $post->ID );
-        }
-
-        $terms_update = $this->handle_terms( $post->ID, $request );
+            $this->handle_template( $request['template'], $post_id );
+        }
+
+        $terms_update = $this->handle_terms( $post_id, $request );
 
         if ( is_wp_error( $terms_update ) ) {
@@ -533 +547 @@
         }
 
-        $post = get_post( $post_id );
-
         if ( ! empty( $schema['properties']['meta'] ) && isset( $request['meta'] ) ) {
-            $meta_update = $this->meta->update_value( $request['meta'], (int) $request['id'] );
+            $meta_update = $this->meta->update_value( $request['meta'], $post_id );
 
             if ( is_wp_error( $meta_update ) ) {
@@ -543 +555 @@
         }
 
+        $post = get_post( $post_id );
         $fields_update = $this->update_additional_fields_for_object( $post, $request );
 
@@ -548 +561 @@
             return $fields_update;
         }
-
-        /**
-         * Fires after a single post is created or updated via the REST API.
-         *
-         * The dynamic portion of the hook name, `$this->post_type`, refers to the post type slug.
-         *
-         * @since 4.7.0
-         *
-         * @param object          $post     Inserted Post object (not a WP_Post object).
-         * @param WP_REST_Request $request  Request object.
-         * @param bool            $creating True when creating post, false when updating.
-         */
-        do_action( "rest_insert_{$this->post_type}", $post, $request, true );
 
         $request->set_param( 'context', 'edit' );
@@ -641 +641 @@
         }
 
+        $post = get_post( $post_id );
+
+        /* This action is documented in lib/endpoints/class-wp-rest-controller.php */
+        do_action( "rest_insert_{$this->post_type}", $post, $request, false );
+
         $schema = $this->get_item_schema();
 
@@ -669 +674 @@
         }
 
-        $post = get_post( $post_id );
-
         if ( ! empty( $schema['properties']['meta'] ) && isset( $request['meta'] ) ) {
             $meta_update = $this->meta->update_value( $request['meta'], $post->ID );
@@ -679 +682 @@
         }
 
+        $post = get_post( $post_id );
         $fields_update = $this->update_additional_fields_for_object( $post, $request );
 
@@ -684 +688 @@
             return $fields_update;
         }
-
-        /* This action is documented in lib/endpoints/class-wp-rest-controller.php */
-        do_action( "rest_insert_{$this->post_type}", $post, $request, false );
 
         $request->set_param( 'context', 'edit' );