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

Timestamp:

12/23/2015 11:43:03 PM (9 years ago)

Author:

obenland

Message:

Taxonomy: Pass object ids to delete_* actions.

Allows for more targeted updates to affected posts in callbacks.
Disambiguates $objects variable and amends unit tests.

Fixes #35213.

File:

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

trunk/src/wp-includes/taxonomy.php

@@ -2159 +2159 @@
     $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 ) );
-
-    foreach ( (array) $objects as $object ) {
-        $terms = wp_get_object_terms($object, $taxonomy, array('fields' => 'ids', 'orderby' => 'none'));
+    $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 ) {
+        $terms = wp_get_object_terms( $object_id, $taxonomy, array( 'fields' => 'ids', 'orderby' => 'none' ) );
         if ( 1 == count($terms) && isset($default) ) {
             $terms = array($default);
@@ -2171 +2171 @@
         }
         $terms = array_map('intval', $terms);
-        wp_set_object_terms($object, $terms, $taxonomy);
+        wp_set_object_terms( $object_id, $terms, $taxonomy );
     }
 
@@ -2177 +2177 @@
     $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 ) );
@@ -2213 +2213 @@
      *
      * @since 2.5.0
+     * @since 4.5.0 Introduced `$object_ids` argument.
      *
      * @param int     $term         Term ID.
@@ -2219 +2220 @@
      * @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 );
 
     /**
@@ -2229 +2231 @@
      *
      * @since 2.3.0
+     * @since 4.5.0 Introduced `$object_ids` argument.
      *
      * @param int     $term         Term ID.
@@ -2234 +2237 @@
      * @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;