diff --git a/wp-includes/taxonomy.php b/wp-includes/taxonomy.php index b250e0feef..c8633d8ea2 100644 --- a/wp-includes/taxonomy.php +++ b/wp-includes/taxonomy.php @@ -1943,6 +1943,11 @@ function wp_delete_term( $term, $taxonomy, $args = array() ) { $object_ids = (array) $wpdb->get_col( $wpdb->prepare( "SELECT object_id FROM $wpdb->term_relationships WHERE term_taxonomy_id = %d", $tt_id ) ); foreach ( $object_ids as $object_id ) { + if ( ! isset( $default ) ) { + wp_remove_object_terms( $object_id, $term, $taxonomy ); + continue; + } + $terms = wp_get_object_terms( $object_id, $taxonomy, @@ -1951,6 +1956,7 @@ function wp_delete_term( $term, $taxonomy, $args = array() ) { 'orderby' => 'none', ) ); + if ( 1 === count( $terms ) && isset( $default ) ) { $terms = array( $default ); } else { @@ -1959,6 +1965,7 @@ function wp_delete_term( $term, $taxonomy, $args = array() ) { $terms = array_merge( $terms, array( $default ) ); } } + $terms = array_map( 'intval', $terms ); wp_set_object_terms( $object_id, $terms, $taxonomy ); } diff --git a/wp-includes/version.php b/wp-includes/version.php index b78769ef4b..16d1c862e0 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -13,7 +13,7 @@ * * @global string $wp_version */ -$wp_version = '5.7-beta3-50388'; +$wp_version = '5.7-beta3-50389'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.