Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-11-05 02:10:45 +01:00
Code Issues Projects Releases Wiki Activity

Pass taxonomy name to actions in term-relationship CRUD functions.

Browse Source 
Props Takahashi_Fumiki.
Fixes #38006.
Built from https://develop.svn.wordpress.org/trunk@38621


git-svn-id: http://core.svn.wordpress.org/trunk@38564 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Boone Gorges 2016-09-18 18:53:30 +00:00
parent 788c3680f9
commit 65bc3d39e6
2 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
wp-includes/taxonomy.php
View File

@ -2526,22 +2526,26 @@ function wp_set_object_terms( $object_id, $terms, $taxonomy, $append = false ) {
* Fires immediately before an object-term relationship is added. * Fires immediately before an object-term relationship is added.
* *
* @since 2.9.0 * @since 2.9.0
* @since 4.7.0 Added the `$taxonomy` parameter.
* *
* @param int $object_id Object ID. * @param int $object_id Object ID.
* @param int $tt_id Term taxonomy ID. * @param int $tt_id Term taxonomy ID.
* @param string $taxonomy Taxonomy slug.
*/ */
do_action( 'add_term_relationship', $object_id, $tt_id ); do_action( 'add_term_relationship', $object_id, $tt_id, $taxonomy );
$wpdb->insert( $wpdb->term_relationships, array( 'object_id' => $object_id, 'term_taxonomy_id' => $tt_id ) ); $wpdb->insert( $wpdb->term_relationships, array( 'object_id' => $object_id, 'term_taxonomy_id' => $tt_id ) );
/** /**
* Fires immediately after an object-term relationship is added. * Fires immediately after an object-term relationship is added.
* *
* @since 2.9.0 * @since 2.9.0
* @since 4.7.0 Added the `$taxonomy` parameter.
* *
* @param int $object_id Object ID. * @param int $object_id Object ID.
* @param int $tt_id Term taxonomy ID. * @param int $tt_id Term taxonomy ID.
* @param string $taxonomy Taxonomy slug.
*/ */
do_action( 'added_term_relationship', $object_id, $tt_id ); do_action( 'added_term_relationship', $object_id, $tt_id, $taxonomy );
$new_tt_ids[] = $tt_id; $new_tt_ids[] = $tt_id;
} }
@ -2661,11 +2665,13 @@ function wp_remove_object_terms( $object_id, $terms, $taxonomy ) {
* Fires immediately before an object-term relationship is deleted. * Fires immediately before an object-term relationship is deleted.
* *
* @since 2.9.0 * @since 2.9.0
* @since 4.7.0 Added the `$taxonomy` parameter.
* *
* @param int $object_id Object ID. * @param int $object_id Object ID.
* @param array $tt_ids An array of term taxonomy IDs. * @param array $tt_ids An array of term taxonomy IDs.
* @param string $taxonomy Taxonomy slug.
*/ */
do_action( 'delete_term_relationships', $object_id, $tt_ids ); do_action( 'delete_term_relationships', $object_id, $tt_ids, $taxonomy );
$deleted = $wpdb->query( $wpdb->prepare( "DELETE FROM $wpdb->term_relationships WHERE object_id = %d AND term_taxonomy_id IN ($in_tt_ids)", $object_id ) ); $deleted = $wpdb->query( $wpdb->prepare( "DELETE FROM $wpdb->term_relationships WHERE object_id = %d AND term_taxonomy_id IN ($in_tt_ids)", $object_id ) );
wp_cache_delete( $object_id, $taxonomy . '_relationships' ); wp_cache_delete( $object_id, $taxonomy . '_relationships' );
@ -2674,11 +2680,13 @@ function wp_remove_object_terms( $object_id, $terms, $taxonomy ) {
* Fires immediately after an object-term relationship is deleted. * Fires immediately after an object-term relationship is deleted.
* *
* @since 2.9.0 * @since 2.9.0
* @since 4.7.0 Added the `$taxonomy` parameter.
* *
* @param int $object_id Object ID. * @param int $object_id Object ID.
* @param array $tt_ids An array of term taxonomy IDs. * @param array $tt_ids An array of term taxonomy IDs.
* @param string $taxonomy Taxonomy slug.
*/ */
do_action( 'deleted_term_relationships', $object_id, $tt_ids ); do_action( 'deleted_term_relationships', $object_id, $tt_ids, $taxonomy );
wp_update_term_count( $tt_ids, $taxonomy ); wp_update_term_count( $tt_ids, $taxonomy );

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.7-alpha-38620'; $wp_version = '4.7-alpha-38621';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.