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
This commit is contained in:
whyisjake 2020-04-14 00:35:06 +00:00
parent 5f935ae2fd
commit ec3c0b4935
2 changed files with 3 additions and 5 deletions

View File

@ -4248,24 +4248,22 @@ function get_term_link( $term, $taxonomy = '' ) {
* Filters the tag link. * Filters the tag link.
* *
* @since 2.3.0 * @since 2.3.0
* @deprecated 2.5.0 Use {@see 'term_link'} instead.
* *
* @param string $termlink Tag link URL. * @param string $termlink Tag link URL.
* @param int $term_id Term ID. * @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 ) { } elseif ( 'category' === $taxonomy ) {
/** /**
* Filters the category link. * Filters the category link.
* *
* @since 1.5.0 * @since 1.5.0
* @deprecated 2.5.0 Use {@see 'term_link'} instead.
* *
* @param string $termlink Category link URL. * @param string $termlink Category link URL.
* @param int $term_id Term ID. * @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 );
} }
/** /**

View File

@ -13,7 +13,7 @@
* *
* @global string $wp_version * @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. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.