Ticket #35213: 35213.diff

src/wp-includes/taxonomy.php

@@ -2158 +2158 @@
         // Get the term before deleting it or its term relationships so we can pass to actions below.
         $deleted_term = get_term( $term, $taxonomy );
 
-        $objects = $wpdb->get_col( $wpdb->prepare( "SELECT object_id FROM $wpdb->term_relationships WHERE term_taxonomy_id = %d", $tt_id ) );
+        $object_ids = (array) $wpdb->get_col( $wpdb->prepare( "SELECT object_id FROM $wpdb->term_relationships WHERE term_taxonomy_id = %d", $tt_id ) );
 
-        foreach ( (array) $objects as $object ) {
-                $terms = wp_get_object_terms($object, $taxonomy, array('fields' => 'ids', 'orderby' => 'none'));
+        foreach ( $object_ids as $object_id ) {
+                $terms = wp_get_object_terms( $object_id, $taxonomy, array( 'fields' => 'ids', 'orderby' => 'none' ) );
                 if ( 1 == count($terms) && isset($default) ) {
                         $terms = array($default);
                 } else {
@@ -2170 +2170 @@
                                 $terms = array_merge($terms, array($default));
                 }
                 $terms = array_map('intval', $terms);
-                wp_set_object_terms($object, $terms, $taxonomy);
+                wp_set_object_terms( $object_id, $terms, $taxonomy );
         }
 
         // Clean the relationship caches for all object types using this term.
         $tax_object = get_taxonomy( $taxonomy );
         foreach ( $tax_object->object_type as $object_type )
-                clean_object_term_cache( $objects, $object_type );
+                clean_object_term_cache( $object_ids, $object_type );
 
         $term_meta_ids = $wpdb->get_col( $wpdb->prepare( "SELECT meta_id FROM $wpdb->termmeta WHERE term_id = %d ", $term ) );
         foreach ( $term_meta_ids as $mid ) {
@@ -2218 +2218 @@
          * @param string  $taxonomy     Taxonomy slug.
          * @param mixed   $deleted_term Copy of the already-deleted term, in the form specified
          *                              by the parent function. WP_Error otherwise.
+         * @param array   $object_ids   List of term object IDs.
          */
-        do_action( 'delete_term', $term, $tt_id, $taxonomy, $deleted_term );
+        do_action( 'delete_term', $term, $tt_id, $taxonomy, $deleted_term, $object_ids );
 
         /**
          * Fires after a term in a specific taxonomy is deleted.
@@ -2233 +2234 @@
          * @param int     $tt_id        Term taxonomy ID.
          * @param mixed   $deleted_term Copy of the already-deleted term, in the form specified
          *                              by the parent function. WP_Error otherwise.
+         * @param array   $object_ids   List of term object IDs.
          */
-        do_action( "delete_$taxonomy", $term, $tt_id, $deleted_term );
+        do_action( "delete_$taxonomy", $term, $tt_id, $deleted_term, $object_ids );
 
         return true;
 }