From 081d0ebbc867fc529bc2a870507da7361899b760 Mon Sep 17 00:00:00 2001
From: Boone Gorges <boonebgorges@gmail.com>
Date: Wed, 10 Oct 2018 04:17:13 +0000
Subject: [PATCH] Revert [43632] from the 4.9 branch.

These new hooks are not part of the 4.9.x scope, and will be reintroduced
as part of 5.0.x.

See #44733.

Built from https://develop.svn.wordpress.org/branches/4.9@43690


git-svn-id: http://core.svn.wordpress.org/branches/4.9@43519 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/taxonomy.php | 21 ---------------------
 wp-includes/version.php  |  2 +-
 2 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/wp-includes/taxonomy.php b/wp-includes/taxonomy.php
index 8cdea3fff8..be3a86986d 100644
--- a/wp-includes/taxonomy.php
+++ b/wp-includes/taxonomy.php
@@ -578,16 +578,6 @@ function register_taxonomy_for_object_type( $taxonomy, $object_type) {
 	// Filter out empties.
 	$wp_taxonomies[ $taxonomy ]->object_type = array_filter( $wp_taxonomies[ $taxonomy ]->object_type );
 
-	/**
-	 * Fires after a taxonomy is registered for an object type.
-	 *
-	 * @since 4.9.9
-	 *
-	 * @param string $taxonomy    Taxonomy name.
-	 * @param string $object_type Name of the object type.
-	 */
-	do_action( 'registered_taxonomy_for_object_type', $taxonomy, $object_type );
-
 	return true;
 }
 
@@ -616,17 +606,6 @@ function unregister_taxonomy_for_object_type( $taxonomy, $object_type ) {
 		return false;
 
 	unset( $wp_taxonomies[ $taxonomy ]->object_type[ $key ] );
-
-	/**
-	 * Fires after a taxonomy is unregistered for an object type.
-	 *
-	 * @since 4.9.9
-	 *
-	 * @param string $taxonomy    Taxonomy name.
-	 * @param string $object_type Name of the object type.
-	 */
-	do_action( 'unregistered_taxonomy_for_object_type', $taxonomy, $object_type );
-
 	return true;
 }
 
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 694ab22eb0..48a5096da9 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.9.9-alpha-43674';
+$wp_version = '4.9.9-alpha-43690';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.