Ticket #42600: 42600.diff

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

@@ -415 +415 @@
                         if ( $term_id = $term->get_error_data( 'term_exists' ) ) {
                                 $existing_term = get_term( $term_id, $this->taxonomy );
                                 $term->add_data( $existing_term->term_id, 'term_exists' );
-                                $term->add_data( array( 'status' => 409 ) );
+                                $term->add_data( array( 'status' => 409, 'term_id' => $term_id ) );
                         }
 
                         return $term;

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

@@ -620 +620 @@
 
         /**
          * @ticket 41370
+         * @ticket 42600
          */
         public function test_create_item_term_already_exists() {
                 wp_set_current_user( self::$administrator );
@@ -627 +628 @@
                 $request->set_param( 'name', 'test' );
                 $response = $this->server->dispatch( $request );
                 $this->assertEquals( 201, $response->get_status() );
+
+                $data = $response->get_data();
+                $term_id = $data['id'];
+                $this->assertTrue( (int) $term_id > 0 );
+
                 $response = $this->server->dispatch( $request );
                 $this->assertEquals( 409, $response->get_status() );
                 $data = $response->get_data();
                 $this->assertEquals( 'term_exists', $data['code'] );
+
+                $data = $response->get_data();
+                $this->assertEquals( (int) $data['data']['term_id'], $term_id );
+
         }
 
         public function test_create_item_invalid_taxonomy() {