Changeset 42372

Timestamp:

12/04/2017 10:03:52 PM (7 years ago)

Author:

boonebgorges

Message:

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.

Merges [42368] to the 4.9 branch.

Fixes #42605. See #42771.

Location:

branches/4.9

Files:

• . (modified) (1 prop)
• src/wp-includes/category-template.php (modified) (1 diff)
• tests/phpunit/tests/category/categoryDescription.php (copied) (copied from trunk/tests/phpunit/tests/category/categoryDescription.php)

branches/4.9/src/wp-includes/category-template.php

@@ -1154 +1154 @@
  *
  * @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;
         }
     }
-    $description = get_term_field( 'description', $term, $taxonomy );
+    $description = get_term_field( 'description', $term );
     return is_wp_error( $description ) ? '' : $description;
 }