Ticket #9927: 9927.5.patch

wp-includes/category-template.php

@@ -286 +286 @@
 /**
  * Retrieve category description.
  *
- * @since 1.0.0
+ * @since 3.0.0
  *
  * @param int $category Optional. Category ID. Will use global category ID by default.
  * @return string Category description, available.
  */
-function category_description( $category = 0 ) {
-        return term_description( $category, 'category' );
+function get_category_description( $category = 0 ) {
+        return get_term_description( $category, 'category' );
 }
 
 /**
@@ -834 +834 @@
 /**
  * Retrieve tag description.
  *
- * @since 2.8
+ * @since 3.0.0
  *
  * @param int $tag Optional. Tag ID. Will use global tag ID by default.
  * @return string Tag description, available.
  */
-function tag_description( $tag = 0 ) {
-        return term_description( $tag );
+function get_tag_description( $tag = 0 ) {
+        return get_term_description( $tag, 'post_tag' );
 }
 
 /**
  * Retrieve term description.
  *
- * @since 2.8
+ * @since 3.0.0
  *
  * @param int $term Optional. Term ID. Will use global term ID by default.
  * @return string Term description, available.
  */
-function term_description( $term = 0, $taxonomy = 'post_tag' ) {
+function get_term_description( $term = 0, $taxonomy = 'post_tag' ) {
         if ( !$term && ( is_tax() || is_tag() || is_category() ) ) {
                 global $wp_query;
                 $term = $wp_query->get_queried_object();

wp-includes/deprecated.php

@@ -2446 +2446 @@
                 $user = $user->ID;
         }
         return get_the_author_meta( $field, $user );
-}
- No newline at end of file
+}
+
+/**
+ * Retrieve category description.
+ *
+ * @since 1.0.0
+ * @deprecated 3.0.0
+ * @deprecated Use get_category_description($category)
+ *
+ * @param int $category Optional. Category ID. Will use global category ID by default.
+ * @return string Category description, available.
+ */
+function category_description( $category = 0 ) {
+        _deprecated_function(__FUNCTION__, '3.0.0', 'get_category_description()' );
+        return get_category_description($category);
+}
+
+/**
+ * Retrieve tag description.
+ *
+ * @since 2.8.0
+ * @deprecated 3.0.0
+ * @deprecated Use get_tag_description($tag)
+ *
+ * @param int $tag Optional. Tag ID. Will use global tag ID by default.
+ * @return string Tag description, available.
+ */
+function tag_description( $tag = 0 ) {
+        _deprecated_function(__FUNCTION__, '3.0.0', 'get_tag_description()' );
+        return get_tag_description($tag);
+}
+
+/**
+ * Retrieve term description.
+ *
+ * @since 2.8.0
+ * @deprecated 3.0.0 
+ * @deprecated Use get_term_description($term, $taxonomy)
+ *
+ * @param int $term Optional. Term ID. Will use global term ID by default.
+ * @return string Term description, available.
+ */
+function term_description( $term = 0, $taxonomy = 'post_tag' ) {
+        _deprecated_function(__FUNCTION__, '3.0.0', 'get_term_description()' );
+        return get_term_description($term, $taxonomy);
+}