Changeset 48480 for trunk/src/wp-includes/taxonomy.php

Timestamp:

07/14/2020 04:39:44 PM (5 years ago)

Author:

SergeyBiryukov

Message:

Taxonomy: Make some adjustments to handling default terms for custom taxonomies:

• Move default term assignment from wp_set_object_terms() to wp_insert_post().
• Make sure the passed taxonomy list overwrites the existing list if not empty.
• Remove the default term option on unregister_taxonomy().
• Prevent deletion of the default term in wp_delete_term().

Props enrico.sorcinelli, TimothyBlynJacobs.
See #43517.

File:

• trunk/src/wp-includes/taxonomy.php (modified) (3 diffs)

trunk/src/wp-includes/taxonomy.php

@@ -507 +507 @@
     $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 ] );
@@ -1825 +1830 @@
     }
 
+    // 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 );
 
@@ -2513 +2527 @@
     }
 
-    // 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(