From 6bd6da908e5b8ffe1697cde4dd042c8b8a493596 Mon Sep 17 00:00:00 2001 From: Boone Gorges Date: Mon, 23 Feb 2015 21:07:34 +0000 Subject: [PATCH] Pass taxonomy name, not object, to 'edit_term_taxonomy' and 'edited_term_taxonomy' actions. These actions are fired in a number of different places, and in some cases the tax name is passed, while in others the taxonomy object is passed. This inconsistency made it difficult for plugins to use the `$taxonomy` value. Props ipm-frommen. Fixes #30999. git-svn-id: https://develop.svn.wordpress.org/trunk@31525 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/taxonomy.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/wp-includes/taxonomy.php b/src/wp-includes/taxonomy.php index 71c422d60b..cf545fb7a3 100644 --- a/src/wp-includes/taxonomy.php +++ b/src/wp-includes/taxonomy.php @@ -4062,11 +4062,11 @@ function _update_post_term_count( $terms, $taxonomy ) { $count += (int) $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM $wpdb->term_relationships, $wpdb->posts WHERE $wpdb->posts.ID = $wpdb->term_relationships.object_id AND post_status = 'publish' AND post_type IN ('" . implode("', '", $object_types ) . "') AND term_taxonomy_id = %d", $term ) ); /** This action is documented in wp-includes/taxonomy.php */ - do_action( 'edit_term_taxonomy', $term, $taxonomy ); + do_action( 'edit_term_taxonomy', $term, $taxonomy->name ); $wpdb->update( $wpdb->term_taxonomy, compact( 'count' ), array( 'term_taxonomy_id' => $term ) ); /** This action is documented in wp-includes/taxonomy.php */ - do_action( 'edited_term_taxonomy', $term, $taxonomy ); + do_action( 'edited_term_taxonomy', $term, $taxonomy->name ); } } @@ -4089,11 +4089,11 @@ function _update_generic_term_count( $terms, $taxonomy ) { $count = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM $wpdb->term_relationships WHERE term_taxonomy_id = %d", $term ) ); /** This action is documented in wp-includes/taxonomy.php */ - do_action( 'edit_term_taxonomy', $term, $taxonomy ); + do_action( 'edit_term_taxonomy', $term, $taxonomy->name ); $wpdb->update( $wpdb->term_taxonomy, compact( 'count' ), array( 'term_taxonomy_id' => $term ) ); /** This action is documented in wp-includes/taxonomy.php */ - do_action( 'edited_term_taxonomy', $term, $taxonomy ); + do_action( 'edited_term_taxonomy', $term, $taxonomy->name ); } }