X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/53f4633144ed68c8b8fb5861f992b5489894a940..073c5ed6408e2f00dc1863b463fe205467628905:/wp-includes/category.php
diff --git a/wp-includes/category.php b/wp-includes/category.php
index a94baa7c..08d18c0a 100644
--- a/wp-includes/category.php
+++ b/wp-includes/category.php
@@ -1,22 +1,26 @@
link", 2: "taxonomy => link_category" alternative */
+ _deprecated_argument( __FUNCTION__, '3.0.0',
+ sprintf( __( '%1$s is deprecated. Use %2$s instead.' ),
+ 'type => link
',
+ 'taxonomy => link_category
'
+ )
+ );
$taxonomy = $args['taxonomy'] = 'link_category';
}
- $categories = (array) get_terms( $taxonomy, $args );
+ $categories = get_terms( $taxonomy, $args );
- foreach ( array_keys( $categories ) as $k )
- _make_cat_compat( $categories[$k] );
+ if ( is_wp_error( $categories ) ) {
+ $categories = array();
+ } else {
+ $categories = (array) $categories;
+ foreach ( array_keys( $categories ) as $k ) {
+ _make_cat_compat( $categories[ $k ] );
+ }
+ }
return $categories;
}
@@ -61,7 +77,7 @@ function get_categories( $args = '' ) {
* If you look at get_term(), then both types will be passed through several
* filters and finally sanitized based on the $filter parameter value.
*
- * The category will converted to maintain backwards compatibility.
+ * The category will converted to maintain backward compatibility.
*
* @since 1.5.1
*
@@ -255,7 +271,7 @@ function get_tags( $args = '' ) {
}
/**
- * Filter the array of term objects returned for the 'post_tag' taxonomy.
+ * Filters the array of term objects returned for the 'post_tag' taxonomy.
*
* @since 2.3.0
*
@@ -317,18 +333,19 @@ function clean_category_cache( $id ) {
* pass to it. This is one of the features with using pass by reference in PHP.
*
* @since 2.3.0
+ * @since 4.4.0 The `$category` parameter now also accepts a WP_Term object.
* @access private
*
- * @param array|object $category Category Row object or array
+ * @param array|object|WP_Term $category Category Row object or array
*/
function _make_cat_compat( &$category ) {
if ( is_object( $category ) && ! is_wp_error( $category ) ) {
- $category->cat_ID = &$category->term_id;
- $category->category_count = &$category->count;
- $category->category_description = &$category->description;
- $category->cat_name = &$category->name;
- $category->category_nicename = &$category->slug;
- $category->category_parent = &$category->parent;
+ $category->cat_ID = $category->term_id;
+ $category->category_count = $category->count;
+ $category->category_description = $category->description;
+ $category->cat_name = $category->name;
+ $category->category_nicename = $category->slug;
+ $category->category_parent = $category->parent;
} elseif ( is_array( $category ) && isset( $category['term_id'] ) ) {
$category['cat_ID'] = &$category['term_id'];
$category['category_count'] = &$category['count'];