From 164a61aeb688bc972d53c835e1a115f6b47d5a55 Mon Sep 17 00:00:00 2001 From: Jb Audras Date: Sat, 27 Nov 2021 15:22:17 +0000 Subject: [PATCH] Taxonomy: Check $term object before using it in `get_term_feed_link()`. This change performs the type safety check on `$term` before it is used to retrieve the taxonomy in `get_term_feed_link()`. It also updates the related DocBlock after [52255]. Follow up to [52255]. Props dlh. Fixes #50225. git-svn-id: https://develop.svn.wordpress.org/trunk@52258 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/link-template.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/wp-includes/link-template.php b/src/wp-includes/link-template.php index 6f44ccefe5..afa8933e35 100644 --- a/src/wp-includes/link-template.php +++ b/src/wp-includes/link-template.php @@ -923,7 +923,6 @@ function get_category_feed_link( $cat, $feed = '' ) { * * @param int|WP_Term|object $term The ID or term object whose feed link will be retrieved. * @param string $taxonomy Optional. Taxonomy of `$term_id`. - * Defaults to 'category' if term ID or non WP_Term object is passed. * @param string $feed Optional. Feed type. Possible values include 'rss2', 'atom'. * Default is the value of get_default_feed(). * @return string|false Link to the feed for the term specified by $term_id and $taxonomy. @@ -935,12 +934,12 @@ function get_term_feed_link( $term, $taxonomy = '', $feed = '' ) { $term = get_term( $term, $taxonomy ); - $taxonomy = $term->taxonomy; - if ( empty( $term ) || is_wp_error( $term ) ) { return false; } + $taxonomy = $term->taxonomy; + if ( empty( $feed ) ) { $feed = get_default_feed(); }