Changeset 34580

Timestamp:

09/26/2015 05:30:34 AM (9 years ago)

Author:

wonderboymusic

Message:

XML-RPC: in wp_xmlrpc_server::wp_editTerm(), check ! empty when applying parent logic.

Adds unit tests.

Props hrishiv90, markoheijnen, sam2kb.
Fixes #21977.

Location:

trunk

Files:

• src/wp-includes/class-wp-xmlrpc-server.php (modified) (1 diff)
• tests/phpunit/tests/xmlrpc/wp/editTerm.php (modified) (1 diff)

trunk/src/wp-includes/class-wp-xmlrpc-server.php

@@ -1935 +1935 @@
         }
 
-        if ( isset( $content_struct['parent'] ) ) {
+        if ( ! empty( $content_struct['parent'] ) ) {
             if ( ! $taxonomy['hierarchical'] )
                 return new IXR_Error( 403, __( "This taxonomy is not hierarchical so you can't set a parent." ) );

trunk/tests/phpunit/tests/xmlrpc/wp/editTerm.php

@@ -93 +93 @@
 
         $result = $this->myxmlrpcserver->wp_editTerm( array( 1, 'editor', 'editor', $this->child_term['term_id'], array( 'taxonomy' => 'category', 'parent' => '', 'name' => 'test' ) ) );
-        $this->assertInstanceOf( 'IXR_Error', $result );
-        $this->assertEquals( 500, $result->code );
-        $this->assertEquals( __('Empty Term'), $result->message );
+        $this->assertNotInstanceOf( 'IXR_Error', $result );
+        $this->assertTrue( $result );
+    }
+
+    function test_parent_null() {
+        $this->make_user_by_role( 'editor' );
+
+        $result = $this->myxmlrpcserver->wp_editTerm( array( 1, 'editor', 'editor', $this->child_term['term_id'], array( 'taxonomy' => 'category', 'parent' => NULL, 'name' => 'test' ) ) );
+
+        $this->assertNotInstanceOf( 'IXR_Error', $result );
+        $this->assertInternalType( 'boolean', $result );
+
+        $term = get_term( $this->child_term['term_id'], 'category' );
+        $this->assertEquals( '0', $term->parent );
     }