From 88ccca5d76694554b90022b104ff0cbdf0bf706a Mon Sep 17 00:00:00 2001 From: Boone Gorges Date: Wed, 19 Dec 2018 03:48:48 +0000 Subject: [PATCH] Ensure that taxonomy name passed to `get_term()` filters is non-empty. Since [34997], the `$taxonomy` parameter of `get_term()` has been optional. This created cases where the `$taxonomy` parameter, used to concatenate names for some filters and passed as a parameter to others, would be empty. This changeset ensures that it's never empty by falling back on the `taxonomy` of the located term. Props dlh. Fixes #45698. Built from https://develop.svn.wordpress.org/trunk@44325 git-svn-id: http://core.svn.wordpress.org/trunk@44155 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/taxonomy.php | 3 +++ wp-includes/version.php | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/wp-includes/taxonomy.php b/wp-includes/taxonomy.php index b46416bc16..87d8e0f202 100644 --- a/wp-includes/taxonomy.php +++ b/wp-includes/taxonomy.php @@ -840,6 +840,9 @@ function get_term( $term, $taxonomy = '', $output = OBJECT, $filter = 'raw' ) { return null; } + // Ensure for filters that this is not empty. + $taxonomy = $_term->taxonomy; + /** * Filters a taxonomy term object. * diff --git a/wp-includes/version.php b/wp-includes/version.php index a78afff068..7d96afa684 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -13,7 +13,7 @@ * * @global string $wp_version */ -$wp_version = '5.1-alpha-44324'; +$wp_version = '5.1-alpha-44325'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.