From ec3c0b493502397e69daa85b585c43f8dd73c9ec Mon Sep 17 00:00:00 2001
From: whyisjake <whyisjake@git.wordpress.org>
Date: Tue, 14 Apr 2020 00:35:06 +0000
Subject: [PATCH] Taxonomy: Un-depracate category_link and tag_link filters.

Depracating these filter might have been an accident, so let's restore.

Props SergeyBiryukov, audrasjb, peterwilsoncc.

Fixes #49759 for the 5.4 branch.

Built from https://develop.svn.wordpress.org/branches/5.4@47577


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

diff --git a/wp-includes/taxonomy.php b/wp-includes/taxonomy.php
index 370cb46ad5..aa5bb6ea4c 100644
--- a/wp-includes/taxonomy.php
+++ b/wp-includes/taxonomy.php
@@ -4248,24 +4248,22 @@ function get_term_link( $term, $taxonomy = '' ) {
 		 * Filters the tag link.
 		 *
 		 * @since 2.3.0
-		 * @deprecated 2.5.0 Use {@see 'term_link'} instead.
 		 *
 		 * @param string $termlink Tag link URL.
 		 * @param int    $term_id  Term ID.
 		 */
-		$termlink = apply_filters_deprecated( 'tag_link', array( $termlink, $term->term_id ), '2.5.0', 'term_link' );
+		$termlink = apply_filters( 'tag_link', $termlink, $term->term_id );
 	} elseif ( 'category' === $taxonomy ) {
 
 		/**
 		 * Filters the category link.
 		 *
 		 * @since 1.5.0
-		 * @deprecated 2.5.0 Use {@see 'term_link'} instead.
 		 *
 		 * @param string $termlink Category link URL.
 		 * @param int    $term_id  Term ID.
 		 */
-		$termlink = apply_filters_deprecated( 'category_link', array( $termlink, $term->term_id ), '2.5.0', 'term_link' );
+		$termlink = apply_filters( 'category_link', $termlink, $term->term_id );
 	}
 
 	/**
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 9a02ce3e03..a396ca619b 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.4.1-alpha-47575';
+$wp_version = '5.4.1-alpha-47577';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.