Ticket #38700: 38700.2.diff

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

@@ -644 +644 @@
                                 return new WP_Error( $error_code, __( 'Comment field exceeds maximum length allowed.' ), array( 'status' => 400 ) );
                         }
 
+                        // wp_update_comment() can return 0 if a real error occurs (this should be an API error)
+                        // or if no DB rows were updated (this should not be an API error).
+
+                        /** This action is documented in wp-includes/comment.php */
+                        $edit_comment_count = did_action( 'edit_comment' );
                         $updated = wp_update_comment( $prepared_args );
+                        /** This action is documented in wp-includes/comment.php */
+                        $edit_comment_count = did_action( 'edit_comment' ) - $edit_comment_count;
 
-                        if ( 0 === $updated ) {
+                        if ( 0 === $updated && 0 === $edit_comment_count ) {
                                 return new WP_Error( 'rest_comment_failed_edit', __( 'Updating comment failed.' ), array( 'status' => 500 ) );
                         }
 

tests/phpunit/tests/rest-api/rest-comments-controller.php

@@ -1586 +1586 @@
                 $this->assertEquals( '2014-11-07T10:14:25', $comment['date'] );
         }
 
+        public function test_update_item_no_change() {
+                wp_set_current_user( self::$admin_id );
+                $request = new WP_REST_Request( 'PUT', sprintf( '/wp/v2/comments/%d', self::$approved_id ) );
+                $response = $this->server->dispatch( $request );
+                $this->assertEquals( 200, $response->get_status() );
+        }
+
         public function test_update_comment_status() {
                 wp_set_current_user( self::$admin_id );
 

tests/phpunit/tests/rest-api/rest-posts-controller.php

@@ -1556 +1556 @@
                 $this->assertEquals( $params['excerpt'], $post->post_excerpt );
         }
 
+        public function test_update_item_no_change() {
+                wp_set_current_user( self::$editor_id );
+                $request = new WP_REST_Request( 'PUT', sprintf( '/wp/v2/posts/%d', self::$post_id ) );
+                $response = $this->server->dispatch( $request );
+                $this->check_update_post_response( $response );
+        }
+
         public function test_rest_update_post() {
                 wp_set_current_user( self::$editor_id );
 

tests/phpunit/tests/rest-api/rest-tags-controller.php

@@ -542 +542 @@
                 $this->assertEquals( 'new-slug', $data['slug'] );
         }
 
+        public function test_update_item_no_change() {
+                wp_set_current_user( self::$administrator );
+                $term = get_term_by( 'id', $this->factory->tag->create(), 'post_tag' );
+                $request = new WP_REST_Request( 'PUT', '/wp/v2/tags/' . $term->term_id );
+                $response = $this->server->dispatch( $request );
+                $this->assertEquals( 200, $response->get_status() );
+        }
+
         public function test_update_item_invalid_term() {
                 wp_set_current_user( self::$administrator );
                 $request = new WP_REST_Request( 'POST', '/wp/v2/tags/' . REST_TESTS_IMPOSSIBLY_HIGH_NUMBER );

tests/phpunit/tests/rest-api/rest-users-controller.php

@@ -840 +840 @@
                 $this->assertEquals( $pw_before, $user->user_pass );
         }
 
+        public function test_update_item_no_change() {
+                $this->allow_user_to_manage_multisite();
+                wp_set_current_user( self::$user );
+                $request = new WP_REST_Request( 'PUT', sprintf( '/wp/v2/users/%d', self::$editor ) );
+                $response = $this->server->dispatch( $request );
+                $this->assertEquals( 200, $response->get_status() );
+        }
+
         public function test_update_item_existing_email() {
                 $user1 = $this->factory->user->create( array( 'user_login' => 'test_json_user', 'user_email' => 'testjson@example.com' ) );
                 $user2 = $this->factory->user->create( array( 'user_login' => 'test_json_user2', 'user_email' => 'testjson2@example.com' ) );