From 39c7daf7db151eee6375974aceb8520fa85a822d Mon Sep 17 00:00:00 2001
From: Boone Gorges <boonebgorges@gmail.com>
Date: Mon, 4 Dec 2017 21:49:46 +0000
Subject: [PATCH] `category_description()` should be taxonomy-agnostic.

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
---
 wp-includes/category-template.php | 9 ++++-----
 wp-includes/version.php           | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/wp-includes/category-template.php b/wp-includes/category-template.php
index f2ed10895c..671d9bfeae 100644
--- a/wp-includes/category-template.php
+++ b/wp-includes/category-template.php
@@ -1200,20 +1200,19 @@ function tag_description( $tag = 0 ) {
  * Retrieve term description.
  *
  * @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 string $taxonomy Optional taxonomy name. Defaults to 'post_tag'.
  * @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() ) ) {
 		$term = get_queried_object();
 		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;
 }
 
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 220aff8077..1bcb13f6ea 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @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.