Upstream
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Taxonomy: Use `WP_Term` object to retrieve the taxonomy in `get_term_feed_link()`. 

This change fixes a backward compatibility issue introduced in [52180] where `get_term_feed_link()` did not honor the `$taxonomy` parameter anymore. Rather than using the default `category` taxonomy when passing a term ID in `get_term_feed_link()`, use the `WP_Term` object to get the taxonomy.

Follow-up to [52180].

Props hugod.
Fixes #50225.

Built from https://develop.svn.wordpress.org/trunk@52255


git-svn-id: http://core.svn.wordpress.org/trunk@51847 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
audrasjb 2021-11-26 11:43:03 +00:00
parent 70f43f261b
commit edd2ca2b6b
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
wp-includes/link-template.php
View File

@ -930,14 +930,13 @@ function get_category_feed_link( $cat, $feed = '' ) {
*/
function get_term_feed_link( $term, $taxonomy = '', $feed = '' ) {
if ( ! is_object( $term ) ) {
$term = (int) $term;
$taxonomy = 'category';
} elseif ( ! $term instanceof WP_Term ) {
$taxonomy = $term->taxonomy;
$term = (int) $term;
}
$term = get_term( $term, $taxonomy );
$taxonomy = $term->taxonomy;
if ( empty( $term ) || is_wp_error( $term ) ) {
return false;
}

2
wp-includes/version.php
View File

@ -16,7 +16,7 @@
*
* @global string $wp_version
*/
$wp_version = '5.9-alpha-52254';
$wp_version = '5.9-alpha-52255';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.