Ticket #43517: 43517.6.patch

src/wp-includes/post.php

@@ -4036 +4036 @@
         // Add default term for all associated custom taxonomies.
         if ( 'auto-draft' !== $post_status ) {
                 foreach ( get_object_taxonomies( $post_type, 'object' ) as $taxonomy => $tax_object ) {
-                        if ( ! empty( $tax_object->default_term ) && ( empty( $postarr['tax_input'] ) || ! isset( $postarr['tax_input'][ $taxonomy ] ) ) ) {
-                                $postarr['tax_input'][ $taxonomy ] = array();
+
+                        if ( ! empty( $tax_object->default_term ) ) {
+
+                                // Filter out empty terms.
+                                if ( isset( $postarr['tax_input'] ) && is_array( $postarr['tax_input'][ $taxonomy ] ) ) {
+                                        $postarr['tax_input'][ $taxonomy ] = array_filter( $postarr['tax_input'][ $taxonomy ] );
+                                }
+
+                                // Passed custom taxonomy list overwrites existing list if not empty.
+                                $terms = wp_get_object_terms( $post_ID, $taxonomy, array( 'fields' => 'ids' ) );
+                                if ( ! empty( $terms) && empty( $postarr['tax_input'][ $taxonomy ] ) ){
+                                        $postarr['tax_input'][ $taxonomy ] = $terms;
+                                }
+
+                                if ( empty( $postarr['tax_input'][ $taxonomy ] ) ) {
+                                        $default_term_id = get_option( 'default_taxonomy_' . $taxonomy );
+                                        if ( ! empty( $default_term_id ) ) {
+                                                $postarr['tax_input'][ $taxonomy ] = array( (int) $default_term_id );
+                                        }
+                                }
                         }
                 }
         }

src/wp-includes/taxonomy.php

@@ -506 +506 @@
         $taxonomy_object->remove_rewrite_rules();
         $taxonomy_object->remove_hooks();
 
+        // Remove custom taxonomy default term option.
+        if ( ! empty( $taxonomy_object->default_term ) ) {
+                delete_option( 'default_taxonomy_' . $taxonomy_object->name );
+        }
+
         // Remove the taxonomy.
         unset( $wp_taxonomies[ $taxonomy ] );
 
@@ -1824 +1829 @@
                 }
         }
 
+        // Don't delete the default custom taxonomy term.
+        $taxonomy_object = get_taxonomy( $taxonomy );
+        if ( ! empty( $taxonomy_object->default_term ) ) {
+                $defaults['default'] = (int) get_option( 'default_taxonomy_' . $taxonomy );
+                if ( $defaults['default'] === $term ) {
+                        return 0;
+                }
+        }
+
         $args = wp_parse_args( $args, $defaults );
 
         if ( isset( $args['default'] ) ) {
@@ -2512 +2526 @@
                 $terms = array( $terms );
         }
 
-        // Add default term.
-        $taxonomy_obj = get_taxonomy( $taxonomy );
-
-        // Default term for this taxonomy.
-        $default_term_id = get_option( 'default_taxonomy_' . $taxonomy );
-        if ( empty( $terms ) && ! empty( $taxonomy_obj->default_term ) && ! empty( $default_term_id ) ) {
-                $terms[] = (int) $default_term_id;
-        }
-
         if ( ! $append ) {
                 $old_tt_ids = wp_get_object_terms(
                         $object_id,

tests/phpunit/tests/taxonomy.php

@@ -999 +999 @@
                         )
                 );
 
+                // Test default category.
                 $term = wp_get_post_terms( $post_id, $tax );
                 $this->assertSame( get_option( 'default_taxonomy_' . $tax ), $term[0]->term_id );
 
+                // Test default term deletion.
+                $this->assertSame( wp_delete_term( $term[0]->term_id, $tax ), 0 );
+
                 // Add custom post type.
                 register_post_type(
                         'post-custom-tax',
@@ -1017 +1021 @@
                 );
                 $term    = wp_get_post_terms( $post_id, $tax );
                 $this->assertSame( get_option( 'default_taxonomy_' . $tax ), $term[0]->term_id );
+
+                // wp_set_object_terms shouldn't assign default category.
+                wp_set_object_terms( $post_id, array(), $tax );
+                $term = wp_get_post_terms( $post_id, $tax );
+                $this->assertSame( array(), $term );
+
+                unregister_taxonomy( $tax );
+                $this->assertSame( get_option( 'default_taxonomy_' . $tax ), false );
         }
 }