Changeset 49328

Timestamp:

10/27/2020 04:40:35 PM (4 years ago)

Author:

SergeyBiryukov

Message:

Posts, Post Types: Check if taxonomy is set for the tax_input parameter of wp_insert_post().

This avoids a PHP notice when creating a post with multiple taxonomies both having a default term.

Props yakimun, szaqal21, hareesh-pillai, audrasjb.
Fixes #51320.

Location:

trunk

Files:

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

trunk/src/wp-includes/post.php

@@ -4092 +4092 @@
 
                 // Filter out empty terms.
-                if ( isset( $postarr['tax_input'] ) && is_array( $postarr['tax_input'][ $taxonomy ] ) ) {
+                if ( isset( $postarr['tax_input'][ $taxonomy ] ) && is_array( $postarr['tax_input'][ $taxonomy ] ) ) {
                     $postarr['tax_input'][ $taxonomy ] = array_filter( $postarr['tax_input'][ $taxonomy ] );
                 }

trunk/tests/phpunit/tests/taxonomy.php

@@ -1008 +1008 @@
 
         // Add post.
-        $post_id = wp_insert_post(
+        $post_id = self::factory()->post->create(
             array(
                 'post_title' => 'Foo',
@@ -1015 +1015 @@
         );
 
-        // Test default category.
+        // Test default term.
         $term = wp_get_post_terms( $post_id, $tax );
         $this->assertSame( get_option( 'default_term_' . $tax ), $term[0]->term_id );
@@ -1029 +1029 @@
             )
         );
-        $post_id = wp_insert_post(
+        $post_id = self::factory()->post->create(
             array(
                 'post_title' => 'Foo',
@@ -1035 +1035 @@
             )
         );
-        $term    = wp_get_post_terms( $post_id, $tax );
+
+        // Test default term.
+        $term = wp_get_post_terms( $post_id, $tax );
         $this->assertSame( get_option( 'default_term_' . $tax ), $term[0]->term_id );
 
-        // wp_set_object_terms shouldn't assign default category.
+        // wp_set_object_terms() should not assign default term.
         wp_set_object_terms( $post_id, array(), $tax );
         $term = wp_get_post_terms( $post_id, $tax );
@@ -1045 +1047 @@
         unregister_taxonomy( $tax );
         $this->assertSame( get_option( 'default_term_' . $tax ), false );
+    }
+
+    /**
+     * @ticket 51320
+     */
+    function test_default_term_for_post_in_multiple_taxonomies() {
+        $post_type = 'test_post_type';
+        $tax1      = 'test_tax1';
+        $tax2      = 'test_tax2';
+
+        register_post_type( $post_type, array( 'taxonomies' => array( $tax1, $tax2 ) ) );
+        register_taxonomy( $tax1, $post_type, array( 'default_term' => 'term_1' ) );
+        register_taxonomy( $tax2, $post_type, array( 'default_term' => 'term_2' ) );
+
+        $post_id = self::factory()->post->create( array( 'post_type' => $post_type ) );
+
+        $taxonomies = get_post_taxonomies( $post_id );
+
+        $this->assertContains( $tax1, $taxonomies );
+        $this->assertContains( $tax2, $taxonomies );
     }