Changeset 29196

Timestamp:

07/16/2014 09:51:40 PM (10 years ago)

Author:

wonderboymusic

Message:

Avoid a race condition when multiple windows are open so that orphaned terms cannot be created by accident.

Adds a unit test.

Props dlh.
Fixes #19205.

Location:

trunk

Files:

• src/wp-includes/taxonomy.php (modified) (1 diff)
• tests/phpunit/tests/term.php (modified) (1 diff)

trunk/src/wp-includes/taxonomy.php

@@ -2419 +2419 @@
     }
     $defaults = array( 'alias_of' => '', 'description' => '', 'parent' => 0, 'slug' => '');
-    $args = wp_parse_args($args, $defaults);
+    $args = wp_parse_args( $args, $defaults );
+
+    if ( $args['parent'] > 0 && ! term_exists( (int) $args['parent'] ) ) {
+        return new WP_Error( 'missing_parent', __( 'The selected parent term no longer exists' ) );
+    }
     $args['name'] = $term;
     $args['taxonomy'] = $taxonomy;

trunk/tests/phpunit/tests/term.php

@@ -691 +691 @@
         $this->assertEquals( 'This description is even more amazing!', $terms[0]->description );
     }
+
+    /**
+     * @ticket 19205
+     */
+    function test_orphan_category() {
+        $cat_id1 = $this->factory->category->create();
+
+        wp_delete_category( $cat_id1 );
+
+        $cat_id2 = $this->factory->category->create( array( 'parent' => $cat_id1 ) );
+        $this->assertWPError( $cat_id2 );
+    }
 }