Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2025-01-24 09:11:24 +01:00
Code Issues Projects Releases Wiki Activity

category_description() should be taxonomy-agnostic.

Browse Source 
This change reinstates the previous de facto behavior of `category_description()`.
See [40979], [42364]. Because `term_description()` no longer passes `$taxonomy` to
`get_term_field()`, the parameter is no longer needed and has been deprecated.

Fixes #42605. See #42771.
Built from https://develop.svn.wordpress.org/trunk@42368


git-svn-id: http://core.svn.wordpress.org/trunk@42197 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Boone Gorges 2017-12-04 21:49:46 +00:00
parent bc769416d8
commit 39c7daf7db
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
wp-includes/category-template.php
View File

@ -1200,20 +1200,19 @@ function tag_description( $tag = 0 ) {
* Retrieve term description. * Retrieve term description.
* *
* @since 2.8.0 * @since 2.8.0
* @since 4.9.2 The `$taxonomy` parameter was deprecated.
* *
* @param int $term Optional. Term ID. Will use global term ID by default. * @param int $term Optional. Term ID. Will use global term ID by default.
* @param string $taxonomy Optional taxonomy name. Defaults to 'post_tag'.
* @return string Term description, available. * @return string Term description, available.
*/ */
function term_description( $term = 0, $taxonomy = 'post_tag' ) { function term_description( $term = 0 ) {
if ( ! $term && ( is_tax() || is_tag() || is_category() ) ) { if ( ! $term && ( is_tax() || is_tag() || is_category() ) ) {
$term = get_queried_object(); $term = get_queried_object();
if ( $term ) { if ( $term ) {
$taxonomy = $term->taxonomy; $term = $term->term_id;
$term = $term->term_id;
} }
} }
$description = get_term_field( 'description', $term, $taxonomy ); $description = get_term_field( 'description', $term );
return is_wp_error( $description ) ? '' : $description; return is_wp_error( $description ) ? '' : $description;
} }

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '5.0-alpha-42367'; $wp_version = '5.0-alpha-42368';
/** /**
* 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.