Changeset 44965

Timestamp:

03/21/2019 06:58:50 PM (6 years ago)

Author:

kadamwhite

Message:

REST API: Avoid undefined-property notice when setting parent term to 0.

Only try to access term_id once $parent_term is known to be a WP_Term.

Props dlh, earnjam.
Fixes #44983.

Location:

trunk

Files:

• src/wp-includes/rest-api/endpoints/class-wp-rest-terms-controller.php (modified) (1 diff)
• tests/phpunit/tests/rest-api/rest-categories-controller.php (modified) (2 diffs)

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

@@ -686 +686 @@
 
         if ( isset( $request['parent'] ) && ! empty( $schema['properties']['parent'] ) ) {
-            $parent_term_id = 0;
-            $parent_term    = get_term( (int) $request['parent'], $this->taxonomy );
-
-            if ( $parent_term ) {
-                $parent_term_id = $parent_term->term_id;
+            $parent_term_id   = 0;
+            $requested_parent = (int) $request['parent'];
+
+            if ( $requested_parent ) {
+                $parent_term = get_term( $requested_parent, $this->taxonomy );
+
+                if ( $parent_term instanceof WP_Term ) {
+                    $parent_term_id = $parent_term->term_id;
+                }
             }
 

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

@@ -860 +860 @@
     }
 
+    public function test_create_item_with_no_parent() {
+        wp_set_current_user( self::$administrator );
+        $parent  = 0;
+        $request = new WP_REST_Request( 'POST', '/wp/v2/categories' );
+        $request->set_param( 'name', 'My Awesome Term' );
+        $request->set_param( 'parent', $parent );
+        $response = rest_get_server()->dispatch( $request );
+        $this->assertEquals( 201, $response->get_status() );
+        $data = $response->get_data();
+        $this->assertEquals( $parent, $data['parent'] );
+    }
+
     public function test_update_item() {
         wp_set_current_user( self::$administrator );
@@ -928 +940 @@
         $data = $response->get_data();
         $this->assertEquals( $parent->term_id, $data['parent'] );
+    }
+
+    public function test_update_item_remove_parent() {
+        wp_set_current_user( self::$administrator );
+
+        $old_parent_term = get_term_by( 'id', $this->factory->category->create(), 'category' );
+        $new_parent_id   = 0;
+
+        $term = get_term_by(
+            'id',
+            $this->factory->category->create(
+                [
+                    'parent' => $old_parent_term->term_id,
+                ]
+            ),
+            'category'
+        );
+
+        $this->assertEquals( $old_parent_term->term_id, $term->parent );
+
+        $request = new WP_REST_Request( 'POST', '/wp/v2/categories/' . $term->term_id );
+        $request->set_param( 'parent', $new_parent_id );
+        $response = rest_get_server()->dispatch( $request );
+        $this->assertEquals( 200, $response->get_status() );
+
+        $data = $response->get_data();
+        $this->assertEquals( $new_parent_id, $data['parent'] );
     }