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

equal deleted inserted replaced

-:2f6f6f7551ca
+:32102edaa81b
 /**
 * Retrieve category link URL.
 *
 * @since 1.0.0
-* @uses apply_filters() Calls 'category_link' filter on category link and category ID.
+* @see get_term_link()
 *
-* @param int $category_id Category ID.
+* @param int|object $category Category ID or object.
-* @return string
+* @return string Link on success, empty string if category does not exist.
 */
-function get_category_link( $category_id ) {
+function get_category_link( $category ) {
-	global $wp_rewrite;
+	if ( ! is_object( $category ) )
-	$catlink = $wp_rewrite->get_category_permastruct();
+		$category = (int) $category;
-	if ( empty( $catlink ) ) {
+	$category = get_term_link( $category, 'category' );
-		$file = get_option( 'home' ) . '/';
-		$catlink = $file . '?cat=' . $category_id;
+	if ( is_wp_error( $category ) )
-	} else {
+		return '';
-		$category = &get_category( $category_id );
-		if ( is_wp_error( $category ) )
+	return $category;
-			return $category;
-		$category_nicename = $category->slug;
-		if ( $category->parent == $category_id ) // recursive recursion
-			$category->parent = 0;
-		elseif ($category->parent != 0 )
-			$category_nicename = get_category_parents( $category->parent, false, '/', true ) . $category_nicename;
-		$catlink = str_replace( '%category%', $category_nicename, $catlink );
-		$catlink = get_option( 'home' ) . user_trailingslashit( $catlink, 'category' );
-	}
-	return apply_filters( 'category_link', $catlink, $category_id );
 }
 /**
 * Retrieve category parents with separator.
 *
 		return $parent;
 	if ( $nicename )
 		$name = $parent->slug;
 	else
-		$name = $parent->cat_name;
+		$name = $parent->name;
 	if ( $parent->parent && ( $parent->parent != $parent->term_id ) && !in_array( $parent->parent, $visited ) ) {
 		$visited[] = $parent->parent;
 		$chain .= get_category_parents( $parent->parent, $link, $separator, $nicename, $visited );
 	}
 	if ( $link )
-		$chain .= '<a href="' . get_category_link( $parent->term_id ) . '" title="' . esc_attr( sprintf( __( "View all posts in %s" ), $parent->cat_name ) ) . '">'.$name.'</a>' . $separator;
+		$chain .= '<a href="' . esc_url( get_category_link( $parent->term_id ) ) . '" title="' . esc_attr( sprintf( __( "View all posts in %s" ), $parent->name ) ) . '">'.$name.'</a>' . $separator;
 	else
 		$chain .= $name.$separator;
 	return $chain;
 }
 *
 * @param int $id Optional, default to current post ID. The post ID.
 * @return array
 */
 function get_the_category( $id = false ) {
-	global $post;
+	$categories = get_the_terms( $id, 'category' );
+	if ( ! $categories )
-	$id = (int) $id;
-	if ( !$id )
-		$id = (int) $post->ID;
-	$categories = get_object_term_cache( $id, 'category' );
-	if ( false === $categories ) {
-		$categories = wp_get_object_terms( $id, 'category' );
-		wp_cache_add($id, $categories, 'category_relationships');
-	}
-	if ( !empty( $categories ) )
-		usort( $categories, '_usort_terms_by_name' );
-	else
 		$categories = array();
-	foreach ( (array) array_keys( $categories ) as $key ) {
+	$categories = array_values( $categories );
+	foreach ( array_keys( $categories ) as $key ) {
 		_make_cat_compat( $categories[$key] );
 	}
-	return $categories;
+	// Filter name is plural because we return alot of categories (possibly more than #13237) not just one
+	return apply_filters( 'get_the_categories', $categories );
 }
 /**
 * Sort categories by name.
 *
 * @param int $post_id Optional. Post ID to retrieve categories.
 * @return string
 */
 function get_the_category_list( $separator = '', $parents='', $post_id = false ) {
 	global $wp_rewrite;
+	if ( ! is_object_in_taxonomy( get_post_type( $post_id ), 'category' ) )
+		return apply_filters( 'the_category', '', $separator, $parents );
 	$categories = get_the_category( $post_id );
 	if ( empty( $categories ) )
 		return apply_filters( 'the_category', __( 'Uncategorized' ), $separator, $parents );
 	$rel = ( is_object( $wp_rewrite ) && $wp_rewrite->using_permalinks() ) ? 'rel="category tag"' : 'rel="category"';
 			$thelist .= "\n\t<li>";
 			switch ( strtolower( $parents ) ) {
 				case 'multiple':
 					if ( $category->parent )
 						$thelist .= get_category_parents( $category->parent, true, $separator );
-					$thelist .= '<a href="' . get_category_link( $category->term_id ) . '" title="' . esc_attr( sprintf( __( "View all posts in %s" ), $category->name ) ) . '" ' . $rel . '>' . $category->name.'</a></li>';
+					$thelist .= '<a href="' . esc_url( get_category_link( $category->term_id ) ) . '" title="' . esc_attr( sprintf( __( "View all posts in %s" ), $category->name ) ) . '" ' . $rel . '>' . $category->name.'</a></li>';
 					break;
 				case 'single':
-					$thelist .= '<a href="' . get_category_link( $category->term_id ) . '" title="' . esc_attr( sprintf( __( "View all posts in %s" ), $category->name ) ) . '" ' . $rel . '>';
+					$thelist .= '<a href="' . esc_url( get_category_link( $category->term_id ) ) . '" title="' . esc_attr( sprintf( __( "View all posts in %s" ), $category->name ) ) . '" ' . $rel . '>';
 					if ( $category->parent )
 						$thelist .= get_category_parents( $category->parent, false, $separator );
 					$thelist .= $category->name.'</a></li>';
 					break;
 				case '':
 				default:
-					$thelist .= '<a href="' . get_category_link( $category->term_id ) . '" title="' . esc_attr( sprintf( __( "View all posts in %s" ), $category->name ) ) . '" ' . $rel . '>' . $category->cat_name.'</a></li>';
+					$thelist .= '<a href="' . esc_url( get_category_link( $category->term_id ) ) . '" title="' . esc_attr( sprintf( __( "View all posts in %s" ), $category->name ) ) . '" ' . $rel . '>' . $category->name.'</a></li>';
 			}
 		}
 		$thelist .= '</ul>';
 	} else {
 		$i = 0;
 		foreach ( $categories as $category ) {
 			if ( 0 < $i )
-				$thelist .= $separator . ' ';
+				$thelist .= $separator;
 			switch ( strtolower( $parents ) ) {
 				case 'multiple':
 					if ( $category->parent )
 						$thelist .= get_category_parents( $category->parent, true, $separator );
-					$thelist .= '<a href="' . get_category_link( $category->term_id ) . '" title="' . esc_attr( sprintf( __( "View all posts in %s" ), $category->name ) ) . '" ' . $rel . '>' . $category->cat_name.'</a>';
+					$thelist .= '<a href="' . esc_url( get_category_link( $category->term_id ) ) . '" title="' . esc_attr( sprintf( __( "View all posts in %s" ), $category->name ) ) . '" ' . $rel . '>' . $category->name.'</a>';
 					break;
 				case 'single':
-					$thelist .= '<a href="' . get_category_link( $category->term_id ) . '" title="' . esc_attr( sprintf( __( "View all posts in %s" ), $category->name ) ) . '" ' . $rel . '>';
+					$thelist .= '<a href="' . esc_url( get_category_link( $category->term_id ) ) . '" title="' . esc_attr( sprintf( __( "View all posts in %s" ), $category->name ) ) . '" ' . $rel . '>';
 					if ( $category->parent )
 						$thelist .= get_category_parents( $category->parent, false, $separator );
-					$thelist .= "$category->cat_name</a>";
+					$thelist .= "$category->name</a>";
 					break;
 				case '':
 				default:
-					$thelist .= '<a href="' . get_category_link( $category->term_id ) . '" title="' . esc_attr( sprintf( __( "View all posts in %s" ), $category->name ) ) . '" ' . $rel . '>' . $category->name.'</a>';
+					$thelist .= '<a href="' . esc_url( get_category_link( $category->term_id ) ) . '" title="' . esc_attr( sprintf( __( "View all posts in %s" ), $category->name ) ) . '" ' . $rel . '>' . $category->name.'</a>';
 			}
 			++$i;
 		}
 	}
 	return apply_filters( 'the_category', $thelist, $separator, $parents );
 }
 /**
 * Check if the current post in within any of the given categories.
 *
 * The given categories are checked against the post's categories' term_ids, names and slugs.
 * Prior to v2.7, this function could only be used in the WordPress Loop.
 * As of 2.7, the function can be used anywhere if it is provided a post ID or post object.
 *
 * @since 1.2.0
 *
-* @uses is_object_in_term()
+* @param int|string|array $category Category ID, name or slug, or array of said.
-*
+* @param int|object $post Optional. Post to check instead of the current post. (since 2.7.0)
-* @param int|string|array $category. Category ID, name or slug, or array of said.
-* @param int|post object Optional.  Post to check instead of the current post. @since 2.7.0
 * @return bool True if the current post is in any of the given categories.
 */
-function in_category( $category, $_post = null ) {
+function in_category( $category, $post = null ) {
 	if ( empty( $category ) )
 		return false;
-	if ( $_post ) {
+	return has_term( $category, 'category', $post );
-		$_post = get_post( $_post );
-	} else {
-		$_post =& $GLOBALS['post'];
-	}
-	if ( !$_post )
-		return false;
-	$r = is_object_in_term( $_post->ID, 'category', $category );
-	if ( is_wp_error( $r ) )
-		return false;
-	return $r;
 }
 /**
 * Display the category list for the post.
 *
 *     'show_option_all' (string) - Text to display for showing all categories.
 *     'show_option_none' (string) - Text to display for showing no categories.
 *     'orderby' (string) default is 'ID' - What column to use for ordering the
 * categories.
 *     'order' (string) default is 'ASC' - What direction to order categories.
-*     'show_last_update' (bool|int) default is 0 - See {@link get_categories()}
 *     'show_count' (bool|int) default is 0 - Whether to show how many posts are
 * in the category.
 *     'hide_empty' (bool|int) default is 1 - Whether to hide categories that
 * don't have any posts attached to them.
 *     'child_of' (int) default is 0 - See {@link get_categories()}.
 *     'exclude' (string) - See {@link get_categories()}.
 *     'echo' (bool|int) default is 1 - Whether to display or retrieve content.
 *     'depth' (int) - The max depth.
 *     'tab_index' (int) - Tab index for select element.
-*     'name' (string) - The name attribute value for selected element.
+*     'name' (string) - The name attribute value for select element.
-*     'class' (string) - The class attribute value for selected element.
+*     'id' (string) - The ID attribute value for select element. Defaults to name if omitted.
+*     'class' (string) - The class attribute value for select element.
 *     'selected' (int) - Which category ID is selected.
+*     'taxonomy' (string) - The name of the taxonomy to retrieve. Defaults to category.
 *
 * The 'hierarchical' argument, which is disabled by default, will override the
 * depth argument, unless it is true. When the argument is false, it will
 * display all of the categories. When it is enabled it will use the value in
 * the 'depth' argument.
 */
 function wp_dropdown_categories( $args = '' ) {
 	$defaults = array(
 		'show_option_all' => '', 'show_option_none' => '',
 		'orderby' => 'id', 'order' => 'ASC',
-		'show_last_update' => 0, 'show_count' => 0,
+		'show_count' => 0,
 		'hide_empty' => 1, 'child_of' => 0,
 		'exclude' => '', 'echo' => 1,
 		'selected' => 0, 'hierarchical' => 0,
-		'name' => 'cat', 'class' => 'postform',
+		'name' => 'cat', 'id' => '',
-		'depth' => 0, 'tab_index' => 0
+		'class' => 'postform', 'depth' => 0,
+		'tab_index' => 0, 'taxonomy' => 'category',
+		'hide_if_empty' => false
 	);
 	$defaults['selected'] = ( is_category() ) ? get_query_var( 'cat' ) : 0;
+	// Back compat.
+	if ( isset( $args['type'] ) && 'link' == $args['type'] ) {
+		_deprecated_argument( __FUNCTION__, '3.0', '' );
+		$args['taxonomy'] = 'link_category';
+	}
 	$r = wp_parse_args( $args, $defaults );
 	if ( !isset( $r['pad_counts'] ) && $r['show_count'] && $r['hierarchical'] ) {
 		$r['pad_counts'] = true;
 	}
-	$r['include_last_update_time'] = $r['show_last_update'];
 	extract( $r );
 	$tab_index_attribute = '';
 	if ( (int) $tab_index > 0 )
 		$tab_index_attribute = " tabindex=\"$tab_index\"";
-	$categories = get_categories( $r );
+	$categories = get_terms( $taxonomy, $r );
-	$name = esc_attr($name);
+	$name = esc_attr( $name );
-	$class = esc_attr($class);
+	$class = esc_attr( $class );
+	$id = $id ? esc_attr( $id ) : $name;
-	$output = '';
+	if ( ! $r['hide_if_empty'] || ! empty($categories) )
+		$output = "<select name='$name' id='$id' class='$class' $tab_index_attribute>\n";
+	else
+		$output = '';
+	if ( empty($categories) && ! $r['hide_if_empty'] && !empty($show_option_none) ) {
+		$show_option_none = apply_filters( 'list_cats', $show_option_none );
+		$output .= "\t<option value='-1' selected='selected'>$show_option_none</option>\n";
+	}
 	if ( ! empty( $categories ) ) {
-		$output = "<select name='$name' id='$name' class='$class' $tab_index_attribute>\n";
 		if ( $show_option_all ) {
 			$show_option_all = apply_filters( 'list_cats', $show_option_all );
 			$selected = ( '0' === strval($r['selected']) ) ? " selected='selected'" : '';
 			$output .= "\t<option value='0'$selected>$show_option_all</option>\n";
 			$depth = $r['depth'];  // Walk the full depth.
 		else
 			$depth = -1; // Flat.
 		$output .= walk_category_dropdown_tree( $categories, $depth, $r );
+	}
+	if ( ! $r['hide_if_empty'] || ! empty($categories) )
 		$output .= "</select>\n";
-	}
 	$output = apply_filters( 'wp_dropdown_cats', $output );
 	if ( $echo )
 		echo $output;
 * The list of arguments is below:
 *     'show_option_all' (string) - Text to display for showing all categories.
 *     'orderby' (string) default is 'ID' - What column to use for ordering the
 * categories.
 *     'order' (string) default is 'ASC' - What direction to order categories.
-*     'show_last_update' (bool|int) default is 0 - See {@link
-* walk_category_dropdown_tree()}
 *     'show_count' (bool|int) default is 0 - Whether to show how many posts are
 * in the category.
 *     'hide_empty' (bool|int) default is 1 - Whether to hide categories that
 * don't have any posts attached to them.
 *     'use_desc_for_title' (bool|int) default is 1 - Whether to use the
 * @param string|array $args Optional. Override default arguments.
 * @return string HTML content only if 'echo' argument is 0.
 */
 function wp_list_categories( $args = '' ) {
 	$defaults = array(
-		'show_option_all' => '', 'orderby' => 'name',
+		'show_option_all' => '', 'show_option_none' => __('No categories'),
-		'order' => 'ASC', 'show_last_update' => 0,
+		'orderby' => 'name', 'order' => 'ASC',
-		'style' => 'list', 'show_count' => 0,
+		'style' => 'list',
-		'hide_empty' => 1, 'use_desc_for_title' => 1,
+		'show_count' => 0, 'hide_empty' => 1,
-		'child_of' => 0, 'feed' => '', 'feed_type' => '',
+		'use_desc_for_title' => 1, 'child_of' => 0,
-		'feed_image' => '', 'exclude' => '', 'exclude_tree' => '', 'current_category' => 0,
+		'feed' => '', 'feed_type' => '',
+		'feed_image' => '', 'exclude' => '',
+		'exclude_tree' => '', 'current_category' => 0,
 		'hierarchical' => true, 'title_li' => __( 'Categories' ),
-		'echo' => 1, 'depth' => 0
+		'echo' => 1, 'depth' => 0,
+		'taxonomy' => 'category'
 	);
 	$r = wp_parse_args( $args, $defaults );
-	if ( !isset( $r['pad_counts'] ) && $r['show_count'] && $r['hierarchical'] ) {
+	if ( !isset( $r['pad_counts'] ) && $r['show_count'] && $r['hierarchical'] )
 		$r['pad_counts'] = true;
-	}
-	if ( isset( $r['show_date'] ) ) {
-		$r['include_last_update_time'] = $r['show_date'];
-	}
 	if ( true == $r['hierarchical'] ) {
 		$r['exclude_tree'] = $r['exclude'];
 		$r['exclude'] = '';
 	}
+	if ( !isset( $r['class'] ) )
+		$r['class'] = ( 'category' == $r['taxonomy'] ) ? 'categories' : $r['taxonomy'];
 	extract( $r );
+	if ( !taxonomy_exists($taxonomy) )
+		return false;
 	$categories = get_categories( $r );
 	$output = '';
 	if ( $title_li && 'list' == $style )
-			$output = '<li class="categories">' . $r['title_li'] . '<ul>';
+			$output = '<li class="' . esc_attr( $class ) . '">' . $title_li . '<ul>';
 	if ( empty( $categories ) ) {
-		if ( 'list' == $style )
+		if ( ! empty( $show_option_none ) ) {
-			$output .= '<li>' . __( "No categories" ) . '</li>';
+			if ( 'list' == $style )
-		else
+				$output .= '<li>' . $show_option_none . '</li>';
-			$output .= __( "No categories" );
+			else
+				$output .= $show_option_none;
+		}
 	} else {
-		global $wp_query;
+		if ( ! empty( $show_option_all ) ) {
+			$posts_page = ( 'page' == get_option( 'show_on_front' ) && get_option( 'page_for_posts' ) ) ? get_permalink( get_option( 'page_for_posts' ) ) : home_url( '/' );
-		if( !empty( $show_option_all ) )
+			$posts_page = esc_url( $posts_page );
 			if ( 'list' == $style )
-				$output .= '<li><a href="' .  get_bloginfo( 'url' )  . '">' . $show_option_all . '</a></li>';
+				$output .= "<li><a href='$posts_page'>$show_option_all</a></li>";
 			else
-				$output .= '<a href="' .  get_bloginfo( 'url' )  . '">' . $show_option_all . '</a>';
+				$output .= "<a href='$posts_page'>$show_option_all</a>";
+		}
-		if ( empty( $r['current_category'] ) && is_category() )
-			$r['current_category'] = $wp_query->get_queried_object_id();
+		if ( empty( $r['current_category'] ) && ( is_category() || is_tax() || is_tag() ) ) {
+			$current_term_object = get_queried_object();
+			if ( $r['taxonomy'] == $current_term_object->taxonomy )
+				$r['current_category'] = get_queried_object_id();
+		}
 		if ( $hierarchical )
 			$depth = $r['depth'];
 		else
 			$depth = -1; // Flat.
 	}
 	if ( $title_li && 'list' == $style )
 		$output .= '</ul></li>';
-	$output = apply_filters( 'wp_list_categories', $output );
+	$output = apply_filters( 'wp_list_categories', $output, $args );
 	if ( $echo )
 		echo $output;
 	else
 		return $output;
 	);
 	$args = wp_parse_args( $args, $defaults );
 	$tags = get_terms( $args['taxonomy'], array_merge( $args, array( 'orderby' => 'count', 'order' => 'DESC' ) ) ); // Always query top tags
-	if ( empty( $tags ) )
+	if ( empty( $tags ) || is_wp_error( $tags ) )
 		return;
 	foreach ( $tags as $key => $tag ) {
 		if ( 'edit' == $args['link'] )
-			$link = get_edit_tag_link( $tag->term_id, $args['taxonomy'] );
+			$link = get_edit_tag_link( $tag->term_id, $tag->taxonomy );
 		else
-			$link = get_term_link( intval($tag->term_id), $args['taxonomy'] );
+			$link = get_term_link( intval($tag->term_id), $tag->taxonomy );
 		if ( is_wp_error( $link ) )
 			return false;
 		$tags[ $key ]->link = $link;
 		$tags[ $key ]->id = $tag->term_id;
 * @return integer scaled count
 */
 function default_topic_count_scale( $count ) {
 	return round(log10($count + 1) * 100);
 }
 /**
 * Generates a tag cloud (heatmap) from provided data.
 *
 * The text size is set by the 'smallest' and 'largest' arguments, which will
 * @param array $tags List of tags.
 * @param string|array $args Optional, override default arguments.
 * @return string
 */
 function wp_generate_tag_cloud( $tags, $args = '' ) {
-	global $wp_rewrite;
 	$defaults = array(
 		'smallest' => 8, 'largest' => 22, 'unit' => 'pt', 'number' => 0,
 		'format' => 'flat', 'separator' => "\n", 'orderby' => 'name', 'order' => 'ASC',
 		'topic_count_text_callback' => 'default_topic_count_text',
 		'topic_count_scale_callback' => 'default_topic_count_scale', 'filter' => 1,
 		if ( 'RAND' == $order ) {
 			shuffle($tags);
 		} else {
 			// SQL cannot save you; this is a second (potentially different) sort on a subset of data.
 			if ( 'name' == $orderby )
-				uasort( $tags, create_function('$a, $b', 'return strnatcasecmp($a->name, $b->name);') );
+				uasort( $tags, '_wp_object_name_sort_cb' );
 			else
-				uasort( $tags, create_function('$a, $b', 'return ($a->count > $b->count);') );
+				uasort( $tags, '_wp_object_count_sort_cb' );
 			if ( 'DESC' == $order )
 				$tags = array_reverse( $tags, true );
 		}
 	}
 		$count = $counts[ $key ];
 		$real_count = $real_counts[ $key ];
 		$tag_link = '#' != $tag->link ? esc_url( $tag->link ) : '#';
 		$tag_id = isset($tags[ $key ]->id) ? $tags[ $key ]->id : $key;
 		$tag_name = $tags[ $key ]->name;
-		$a[] = "<a href='$tag_link' class='tag-link-$tag_id' title='" . esc_attr( $topic_count_text_callback( $real_count ) ) . "' style='font-size: " .
+		$a[] = "<a href='$tag_link' class='tag-link-$tag_id' title='" . esc_attr( call_user_func( $topic_count_text_callback, $real_count ) ) . "' style='font-size: " .
-			( $smallest + ( ( $count - $min_count ) * $font_step ) )
+			str_replace( ',', '.', ( $smallest + ( ( $count - $min_count ) * $font_step ) ) )
 			. "$unit;'>$tag_name</a>";
 	}
 	switch ( $format ) :
 	case 'array' :
 	default :
 		$return = join( $separator, $a );
 		break;
 	endswitch;
-if ( $filter )
+	if ( $filter )
 		return apply_filters( 'wp_generate_tag_cloud', $return, $tags, $args );
-else
+	else
 		return $return;
+}
+/**
+* Callback for comparing objects based on name
+*
+* @since 3.1.0
+* @access private
+*/
+function _wp_object_name_sort_cb( $a, $b ) {
+	return strnatcasecmp( $a->name, $b->name );
+}
+/**
+* Callback for comparing objects based on count
+*
+* @since 3.1.0
+* @access private
+*/
+function _wp_object_count_sort_cb( $a, $b ) {
+	return ( $a->count > $b->count );
 }
 //
 // Helper functions
 //
 		$walker = $args[2]['walker'];
 	return call_user_func_array(array( &$walker, 'walk' ), $args );
 }
+/**
+* Create HTML list of categories.
+*
+* @package WordPress
+* @since 2.1.0
+* @uses Walker
+*/
+class Walker_Category extends Walker {
+	/**
+	 * @see Walker::$tree_type
+	 * @since 2.1.0
+	 * @var string
+	 */
+	var $tree_type = 'category';
+	/**
+	 * @see Walker::$db_fields
+	 * @since 2.1.0
+	 * @todo Decouple this
+	 * @var array
+	 */
+	var $db_fields = array ('parent' => 'parent', 'id' => 'term_id');
+	/**
+	 * @see Walker::start_lvl()
+	 * @since 2.1.0
+	 *
+	 * @param string $output Passed by reference. Used to append additional content.
+	 * @param int $depth Depth of category. Used for tab indentation.
+	 * @param array $args Will only append content if style argument value is 'list'.
+	 */
+	function start_lvl( &$output, $depth = 0, $args = array() ) {
+		if ( 'list' != $args['style'] )
+			return;
+		$indent = str_repeat("\t", $depth);
+		$output .= "$indent<ul class='children'>\n";
+	}
+	/**
+	 * @see Walker::end_lvl()
+	 * @since 2.1.0
+	 *
+	 * @param string $output Passed by reference. Used to append additional content.
+	 * @param int $depth Depth of category. Used for tab indentation.
+	 * @param array $args Will only append content if style argument value is 'list'.
+	 */
+	function end_lvl( &$output, $depth = 0, $args = array() ) {
+		if ( 'list' != $args['style'] )
+			return;
+		$indent = str_repeat("\t", $depth);
+		$output .= "$indent</ul>\n";
+	}
+	/**
+	 * @see Walker::start_el()
+	 * @since 2.1.0
+	 *
+	 * @param string $output Passed by reference. Used to append additional content.
+	 * @param object $category Category data object.
+	 * @param int $depth Depth of category in reference to parents.
+	 * @param array $args
+	 */
+	function start_el( &$output, $category, $depth = 0, $args = array(), $id = 0 ) {
+		extract($args);
+		$cat_name = esc_attr( $category->name );
+		$cat_name = apply_filters( 'list_cats', $cat_name, $category );
+		$link = '<a href="' . esc_url( get_term_link($category) ) . '" ';
+		if ( $use_desc_for_title == 0 || empty($category->description) )
+			$link .= 'title="' . esc_attr( sprintf(__( 'View all posts filed under %s' ), $cat_name) ) . '"';
+		else
+			$link .= 'title="' . esc_attr( strip_tags( apply_filters( 'category_description', $category->description, $category ) ) ) . '"';
+		$link .= '>';
+		$link .= $cat_name . '</a>';
+		if ( !empty($feed_image) || !empty($feed) ) {
+			$link .= ' ';
+			if ( empty($feed_image) )
+				$link .= '(';
+			$link .= '<a href="' . esc_url( get_term_feed_link( $category->term_id, $category->taxonomy, $feed_type ) ) . '"';
+			if ( empty($feed) ) {
+				$alt = ' alt="' . sprintf(__( 'Feed for all posts filed under %s' ), $cat_name ) . '"';
+			} else {
+				$title = ' title="' . $feed . '"';
+				$alt = ' alt="' . $feed . '"';
+				$name = $feed;
+				$link .= $title;
+			}
+			$link .= '>';
+			if ( empty($feed_image) )
+				$link .= $name;
+			else
+				$link .= "<img src='$feed_image'$alt$title" . ' />';
+			$link .= '</a>';
+			if ( empty($feed_image) )
+				$link .= ')';
+		}
+		if ( !empty($show_count) )
+			$link .= ' (' . intval($category->count) . ')';
+		if ( 'list' == $args['style'] ) {
+			$output .= "\t<li";
+			$class = 'cat-item cat-item-' . $category->term_id;
+			if ( !empty($current_category) ) {
+				$_current_category = get_term( $current_category, $category->taxonomy );
+				if ( $category->term_id == $current_category )
+					$class .=  ' current-cat';
+				elseif ( $category->term_id == $_current_category->parent )
+					$class .=  ' current-cat-parent';
+			}
+			$output .=  ' class="' . $class . '"';
+			$output .= ">$link\n";
+		} else {
+			$output .= "\t$link<br />\n";
+		}
+	}
+	/**
+	 * @see Walker::end_el()
+	 * @since 2.1.0
+	 *
+	 * @param string $output Passed by reference. Used to append additional content.
+	 * @param object $page Not used.
+	 * @param int $depth Depth of category. Not used.
+	 * @param array $args Only uses 'list' for whether should append to output.
+	 */
+	function end_el( &$output, $page, $depth = 0, $args = array() ) {
+		if ( 'list' != $args['style'] )
+			return;
+		$output .= "</li>\n";
+	}
+}
+/**
+* Create HTML dropdown list of Categories.
+*
+* @package WordPress
+* @since 2.1.0
+* @uses Walker
+*/
+class Walker_CategoryDropdown extends Walker {
+	/**
+	 * @see Walker::$tree_type
+	 * @since 2.1.0
+	 * @var string
+	 */
+	var $tree_type = 'category';
+	/**
+	 * @see Walker::$db_fields
+	 * @since 2.1.0
+	 * @todo Decouple this
+	 * @var array
+	 */
+	var $db_fields = array ('parent' => 'parent', 'id' => 'term_id');
+	/**
+	 * @see Walker::start_el()
+	 * @since 2.1.0
+	 *
+	 * @param string $output Passed by reference. Used to append additional content.
+	 * @param object $category Category data object.
+	 * @param int $depth Depth of category. Used for padding.
+	 * @param array $args Uses 'selected' and 'show_count' keys, if they exist.
+	 */
+	function start_el( &$output, $category, $depth, $args, $id = 0 ) {
+		$pad = str_repeat('&nbsp;', $depth * 3);
+		$cat_name = apply_filters('list_cats', $category->name, $category);
+		$output .= "\t<option class=\"level-$depth\" value=\"".$category->term_id."\"";
+		if ( $category->term_id == $args['selected'] )
+			$output .= ' selected="selected"';
+		$output .= '>';
+		$output .= $pad.$cat_name;
+		if ( $args['show_count'] )
+			$output .= '&nbsp;&nbsp;('. $category->count .')';
+		$output .= "</option>\n";
+	}
+}
 //
 // Tags
 //
 /**
 * Retrieve the link to the tag.
 *
 * @since 2.3.0
-* @uses apply_filters() Calls 'tag_link' with tag link and tag ID as parameters.
+* @see get_term_link()
 *
-* @param int $tag_id Tag (term) ID.
+* @param int|object $tag Tag ID or object.
-* @return string
+* @return string Link on success, empty string if tag does not exist.
 */
-function get_tag_link( $tag_id ) {
+function get_tag_link( $tag ) {
-	global $wp_rewrite;
+	if ( ! is_object( $tag ) )
-	$taglink = $wp_rewrite->get_tag_permastruct();
+		$tag = (int) $tag;
-	$tag = &get_term( $tag_id, 'post_tag' );
+	$tag = get_term_link( $tag, 'post_tag' );
 	if ( is_wp_error( $tag ) )
-		return $tag;
+		return '';
-	$slug = $tag->slug;
+	return $tag;
-	if ( empty( $taglink ) ) {
-		$file = get_option( 'home' ) . '/';
-		$taglink = $file . '?tag=' . $slug;
-	} else {
-		$taglink = str_replace( '%tag%', $slug, $taglink );
-		$taglink = get_option( 'home' ) . user_trailingslashit( $taglink, 'category' );
-	}
-	return apply_filters( 'tag_link', $taglink, $tag_id );
 }
 /**
 * Retrieve the tags for a post.
 *
 * @uses apply_filters() Calls 'the_tags' filter on string list of tags.
 *
 * @param string $before Optional. Before tags.
 * @param string $sep Optional. Between tags.
 * @param string $after Optional. After tags.
+* @param int $id Optional. Post ID. Defaults to the current post.
 * @return string
 */
-function get_the_tag_list( $before = '', $sep = '', $after = '' ) {
+function get_the_tag_list( $before = '', $sep = '', $after = '', $id = 0 ) {
-	return apply_filters( 'the_tags', get_the_term_list( 0, 'post_tag', $before, $sep, $after ), $before, $sep, $after);
+	return apply_filters( 'the_tags', get_the_term_list( $id, 'post_tag', $before, $sep, $after ), $before, $sep, $after, $id );
 }
 /**
 * Retrieve the tags for a post.
 *
 * Retrieve term description.
 *
 * @since 2.8
 *
 * @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' ) {
 	if ( !$term && ( is_tax() || is_tag() || is_category() ) ) {
-		global $wp_query;
+		$term = get_queried_object();
-		$term = $wp_query->get_queried_object();
 		$taxonomy = $term->taxonomy;
 		$term = $term->term_id;
 	}
-	return get_term_field( 'description', $term, $taxonomy );
+	$description = get_term_field( 'description', $term, $taxonomy );
+	return is_wp_error( $description ) ? '' : $description;
 }
 /**
 * Retrieve the terms of the taxonomy that are attached to the post.
 *
-* This function can only be used within the loop.
-*
 * @since 2.5.0
 *
-* @param int $id Post ID. Is not optional.
+* @param int $id Post ID.
 * @param string $taxonomy Taxonomy name.
 * @return array|bool False on failure. Array of term objects on success.
 */
-function get_the_terms( $id = 0, $taxonomy ) {
+function get_the_terms( $id, $taxonomy ) {
 	global $post;
 	$id = (int) $id;
 	if ( !$id ) {
-		if ( !$post->ID )
+		if ( empty( $post->ID ) )
 			return false;
 		else
 			$id = (int) $post->ID;
 	}
 	$terms = get_object_term_cache( $id, $taxonomy );
-	if ( false === $terms )
+	if ( false === $terms ) {
 		$terms = wp_get_object_terms( $id, $taxonomy );
+		wp_cache_add($id, $terms, $taxonomy . '_relationships');
+	}
+	$terms = apply_filters( 'get_the_terms', $terms, $id, $taxonomy );
 	if ( empty( $terms ) )
 		return false;
 	return $terms;
 * @param string $before Optional. Before list.
 * @param string $sep Optional. Separate items using this.
 * @param string $after Optional. After list.
 * @return string
 */
-function get_the_term_list( $id = 0, $taxonomy, $before = '', $sep = '', $after = '' ) {
+function get_the_term_list( $id, $taxonomy, $before = '', $sep = '', $after = '' ) {
 	$terms = get_the_terms( $id, $taxonomy );
 	if ( is_wp_error( $terms ) )
 		return $terms;
 	foreach ( $terms as $term ) {
 		$link = get_term_link( $term, $taxonomy );
 		if ( is_wp_error( $link ) )
 			return $link;
-		$term_links[] = '<a href="' . $link . '" rel="tag">' . $term->name . '</a>';
+		$term_links[] = '<a href="' . esc_url( $link ) . '" rel="tag">' . $term->name . '</a>';
 	}
 	$term_links = apply_filters( "term_links-$taxonomy", $term_links );
 	return $before . join( $sep, $term_links ) . $after;
 /**
 * Display the terms in a list.
 *
 * @since 2.5.0
 *
-* @param int $id Term ID.
+* @param int $id Post ID.
 * @param string $taxonomy Taxonomy name.
 * @param string $before Optional. Before list.
 * @param string $sep Optional. Separate items using this.
 * @param string $after Optional. After list.
 * @return null|bool False on WordPress error. Returns null when displaying.
 	echo apply_filters('the_terms', $term_list, $taxonomy, $before, $sep, $after);
 }
 /**
+* Check if the current post has any of given category.
+*
+* @since 3.1.0
+*
+* @param string|int|array $category Optional. The category name/term_id/slug or array of them to check for.
+* @param int|object $post Optional. Post to check instead of the current post.
+* @return bool True if the current post has any of the given categories (or any category, if no category specified).
+*/
+function has_category( $category = '', $post = null ) {
+	return has_term( $category, 'category', $post );
+}
+/**
 * Check if the current post has any of given tags.
 *
 * The given tags are checked against the post's tags' term_ids, names and slugs.
 * Tags given as integers will only be checked against the post's tags' term_ids.
 * If no tags are given, determines if post has any tags.
 * Prior to v2.7, this function could only be used in the WordPress Loop.
 * As of 2.7, the function can be used anywhere if it is provided a post ID or post object.
 *
 * @since 2.6.0
 *
-* @uses is_object_in_term()
-*
 * @param string|int|array $tag Optional. The tag name/term_id/slug or array of them to check for.
-* @param int|post object Optional.  Post to check instead of the current post. @since 2.7.0
+* @param int|object $post Optional. Post to check instead of the current post. (since 2.7.0)
-* @return bool True if the current post has any of the the given tags (or any tag, if no tag specified).
+* @return bool True if the current post has any of the given tags (or any tag, if no tag specified).
 */
-function has_tag( $tag = '', $_post = null ) {
+function has_tag( $tag = '', $post = null ) {
-	if ( $_post ) {
+	return has_term( $tag, 'post_tag', $post );
-		$_post = get_post( $_post );
+}
-	} else {
-		$_post =& $GLOBALS['post'];
+/**
-	}
+* Check if the current post has any of given terms.
+*
-	if ( !$_post )
+* The given terms are checked against the post's terms' term_ids, names and slugs.
+* Terms given as integers will only be checked against the post's terms' term_ids.
+* If no terms are given, determines if post has any terms.
+*
+* @since 3.1.0
+*
+* @param string|int|array $term Optional. The term name/term_id/slug or array of them to check for.
+* @param string $taxonomy Taxonomy name
+* @param int|object $post Optional. Post to check instead of the current post.
+* @return bool True if the current post has any of the given tags (or any tag, if no tag specified).
+*/
+function has_term( $term = '', $taxonomy = '', $post = null ) {
+	$post = get_post($post);
+	if ( !$post )
 		return false;
-	$r = is_object_in_term( $_post->ID, 'post_tag', $tag );
+	$r = is_object_in_term( $post->ID, $taxonomy, $term );
 	if ( is_wp_error( $r ) )
 		return false;
 	return $r;
 }
-?>

changeset 194	32102edaa81b
parent 136	bde1974c263b
child 204	09a1c134465b