site_iri: comparison web/wp-includes/category.php

equal deleted inserted replaced

-:2f6f6f7551ca
+:32102edaa81b
 *
 * @return object List of all of the category IDs.
 */
 function get_all_category_ids() {
 	if ( ! $cat_ids = wp_cache_get( 'all_category_ids', 'category' ) ) {
-		$cat_ids = get_terms( 'category', 'fields=ids&get=all' );
+		$cat_ids = get_terms( 'category', array('fields' => 'ids', 'get' => 'all') );
 		wp_cache_add( 'all_category_ids', $cat_ids, 'category' );
 	}
 	return $cat_ids;
 }
 *
 * @param string|array $args Optional. Change the defaults retrieving categories.
 * @return array List of categories.
 */
 function &get_categories( $args = '' ) {
-	$defaults = array( 'type' => 'category' );
+	$defaults = array( 'taxonomy' => 'category' );
 	$args = wp_parse_args( $args, $defaults );
-	$taxonomy = apply_filters( 'get_categories_taxonomy', 'category', $args );
+	$taxonomy = apply_filters( 'get_categories_taxonomy', $args['taxonomy'], $args );
-	if ( 'link' == $args['type'] )
-		$taxonomy = 'link_category';
+	// Back compat
+	if ( isset($args['type']) && 'link' == $args['type'] ) {
+		_deprecated_argument( __FUNCTION__, '3.0', '' );
+		$taxonomy = $args['taxonomy'] = 'link_category';
+	}
 	$categories = (array) get_terms( $taxonomy, $args );
 	foreach ( array_keys( $categories ) as $k )
 		_make_cat_compat( $categories[$k] );
 * for it when using this function.
 *
 * @since 2.1.0
 *
 * @param string $category_path URL containing category slugs.
-* @param bool $full_match Optional. Whether should match full path or not.
+* @param bool $full_match Optional. Whether full path should be matched.
 * @param string $output Optional. Constant OBJECT, ARRAY_A, or ARRAY_N
 * @return null|object|array Null on failure. Type is based on $output value.
 */
 function get_category_by_path( $category_path, $full_match = true, $output = OBJECT ) {
 	$category_path = rawurlencode( urldecode( $category_path ) );
 	$category_paths = explode( '/', $category_paths );
 	$full_path = '';
 	foreach ( (array) $category_paths as $pathdir )
 		$full_path .= ( $pathdir != '' ? '/' : '' ) . sanitize_title( $pathdir );
-	$categories = get_terms( 'category', "get=all&slug=$leaf_path" );
+	$categories = get_terms( 'category', array('get' => 'all', 'slug' => $leaf_path) );
 	if ( empty( $categories ) )
 		return null;
 	foreach ( $categories as $category ) {
 		_make_cat_compat( $category );
 	return $category;
 }
 /**
 * Retrieve the ID of a category from its name.
 *
 * @since 1.0.0
 *
 	if ( $cat )
 		return $cat->term_id;
 	return 0;
 }
 /**
 * Retrieve the name of a category from its ID.
 *
 * @since 1.0.0
 *
 * @param int $cat_id Category ID
-* @return string Category name
+* @return string Category name, or an empty string if category doesn't exist.
 */
 function get_cat_name( $cat_id ) {
 	$cat_id = (int) $cat_id;
 	$category = &get_category( $cat_id );
+	if ( ! $category || is_wp_error( $category ) )
+		return '';
 	return $category->name;
 }
 /**
 * Check if a category is an ancestor of another category.
 *
 * You can use either an id or the category object for both parameters. If you
 * @param int|object $cat1 ID or object to check if this is the parent category.
 * @param int|object $cat2 The child category.
 * @return bool Whether $cat2 is child of $cat1
 */
 function cat_is_ancestor_of( $cat1, $cat2 ) {
-	if ( ! isset($cat1->term_id) )
+	return term_is_ancestor_of( $cat1, $cat2, 'category' );
-		$cat1 = &get_category( $cat1 );
+}
-	if ( ! isset($cat2->parent) )
-		$cat2 = &get_category( $cat2 );
-	if ( empty($cat1->term_id) || empty($cat2->parent) )
-		return false;
-	if ( $cat2->parent == $cat1->term_id )
-		return true;
-	return cat_is_ancestor_of( $cat1, get_category( $cat2->parent ) );
-}
 /**
 * Sanitizes category data based on context.
 *
 * @since 2.3.0
 * @return object|array Same type as $category with sanitized data for safe use.
 */
 function sanitize_category( $category, $context = 'display' ) {
 	return sanitize_term( $category, 'category', $context );
 }
 /**
 * Sanitizes data in single category key field.
 *
 * @since 2.3.0
 	return sanitize_term_field( $field, $value, $cat_id, 'category', $context );
 }
 /* Tags */
 /**
 * Retrieves all post tags.
 *
 * @since 2.3.0
 * @see get_terms() For list of arguments to pass.
 	}
 	$tags = apply_filters( 'get_tags', $tags, $args );
 	return $tags;
 }
 /**
 * Retrieve post tag by tag ID or tag object.
 *
 * If you pass the $tag parameter an object, which is assumed to be the tag row
 */
 function &get_tag( $tag, $output = OBJECT, $filter = 'raw' ) {
 	return get_term( $tag, 'post_tag', $output, $filter );
 }
 /* Cache */
-/**
-* Update the categories cache.
-*
-* This function does not appear to be used anymore or does not appear to be
-* needed. It might be a legacy function left over from when there was a need
-* for updating the category cache.
-*
-* @since 1.5.0
-*
-* @return bool Always return True
-*/
-function update_category_cache() {
-	return true;
-}
 /**
 * Remove the category cache data based on ID.
 *
 * @since 2.1.0
 * @param int $id Category ID
 */
 function clean_category_cache( $id ) {
 	clean_term_cache( $id, 'category' );
 }
 /**
 * Update category structure to old pre 2.3 from new taxonomy structure.
 *
 * This function was added for the taxonomy support to update the new category
 		$category['cat_name'] = &$category['name'];
 		$category['category_nicename'] = &$category['slug'];
 		$category['category_parent'] = &$category['parent'];
 	}
 }
-?>

changeset 194	32102edaa81b
parent 136	bde1974c263b
child 204	09a1c134465b