From 14e6c301ea6fe22679030e621654bf0af5d16f7b Mon Sep 17 00:00:00 2001
From: Boone Gorges <boonebgorges@gmail.com>
Date: Fri, 21 Nov 2014 03:14:23 +0000
Subject: [PATCH] Pass the taxonomy of the split tt_id to the
 'split_shared_term' filter.

Props mboynes.
See #30335.
Built from https://develop.svn.wordpress.org/trunk@30493


git-svn-id: http://core.svn.wordpress.org/trunk@30482 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/taxonomy.php | 9 +++++----
 wp-includes/version.php  | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/wp-includes/taxonomy.php b/wp-includes/taxonomy.php
index 5936fb3d1f..2fdc62a2a6 100644
--- a/wp-includes/taxonomy.php
+++ b/wp-includes/taxonomy.php
@@ -4125,11 +4125,12 @@ function _split_shared_term( $term_id, $term_taxonomy_id ) {
 	 *
 	 * @since 4.1.0
 	 *
-	 * @param int $term_id          ID of the formerly shared term.
-	 * @param int $new_term_id      ID of the new term created for the $term_taxonomy_id.
-	 * @param int $term_taxonomy_id ID for the term_taxonomy row affected by the split.
+	 * @param int    $term_id          ID of the formerly shared term.
+	 * @param int    $new_term_id      ID of the new term created for the $term_taxonomy_id.
+	 * @param int    $term_taxonomy_id ID for the term_taxonomy row affected by the split.
+	 * @param string $taxonomy         Taxonomy for the split term.
 	 */
-	do_action( 'split_shared_term', $term_id, $new_term_id, $term_taxonomy_id );
+	do_action( 'split_shared_term', $term_id, $new_term_id, $term_taxonomy_id, $term_taxonomy->taxonomy );
 
 	return $new_term_id;
 }
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 9eed90cf49..8af3c13d2b 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.1-beta2-30492';
+$wp_version = '4.1-beta2-30493';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.