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

equal deleted inserted replaced

-:a4642baaf829
+:4d4862461b8d
 	);
 	$defaults['selected'] = ( is_category() ) ? get_query_var( 'cat' ) : 0;
 	$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 )
 * @return array Generated tag cloud, only if no failures and 'array' is set for the 'format' argument.
 */
 function wp_tag_cloud( $args = '' ) {
 	$defaults = array(
 		'smallest' => 8, 'largest' => 22, 'unit' => 'pt', 'number' => 45,
-		'format' => 'flat', 'orderby' => 'name', 'order' => 'ASC',
+		'format' => 'flat', 'separator' => "\n", 'orderby' => 'name', 'order' => 'ASC',
 		'exclude' => '', 'include' => '', 'link' => 'view', 'taxonomy' => 'post_tag', 'echo' => true
 	);
 	$args = wp_parse_args( $args, $defaults );
 	$tags = get_terms( $args['taxonomy'], array_merge( $args, array( 'orderby' => 'count', 'order' => 'DESC' ) ) ); // Always query top tags
 function default_topic_count_text( $count ) {
 	return sprintf( _n('%s topic', '%s topics', $count), number_format_i18n( $count ) );
 }
 /**
+* Default topic count scaling for tag links
+*
+* @param integer $count number of posts with that tag
+* @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
 * use the 'unit' argument value for the CSS text size unit. The 'format'
 * argument can be 'flat' (default), 'list', or 'array'. The flat value for the
 * 'format' argument will separate tags with spaces. The list value for the
 * 'format' argument will format the tags in a UL HTML list. The array value for
 * the 'format' argument will return in PHP array type format.
 *
-* The 'tag_cloud_sort' filter allows you to override the sorting done
+* The 'tag_cloud_sort' filter allows you to override the sorting.
-* by the 'orderby' argument; passed to the filter: $tags array and $args array.
+* Passed to the filter: $tags array and $args array, has to return the $tags array
+* after sorting it.
 *
 * The 'orderby' argument will accept 'name' or 'count' and defaults to 'name'.
 * The 'order' is the direction to sort, defaults to 'ASC' and can be 'DESC' or
 * 'RAND'.
 *
 */
 function wp_generate_tag_cloud( $tags, $args = '' ) {
 	global $wp_rewrite;
 	$defaults = array(
 		'smallest' => 8, 'largest' => 22, 'unit' => 'pt', 'number' => 0,
-		'format' => 'flat', 'orderby' => 'name', 'order' => 'ASC',
+		'format' => 'flat', 'separator' => "\n", 'orderby' => 'name', 'order' => 'ASC',
 		'topic_count_text_callback' => 'default_topic_count_text',
-		'filter' => 1,
+		'topic_count_scale_callback' => 'default_topic_count_scale', 'filter' => 1,
 	);
 	if ( !isset( $args['topic_count_text_callback'] ) && isset( $args['single_text'] ) && isset( $args['multiple_text'] ) ) {
 		$body = 'return sprintf (
-			_n('.var_export($args['single_text'], true).', '.var_export($args['multiple_text'], true).', $count),
+			_n(' . var_export($args['single_text'], true) . ', ' . var_export($args['multiple_text'], true) . ', $count),
 			number_format_i18n( $count ));';
 		$args['topic_count_text_callback'] = create_function('$count', $body);
 	}
 	$args = wp_parse_args( $args, $defaults );
 	extract( $args );
 	if ( empty( $tags ) )
 		return;
-	// SQL cannot save you; this is a second (potentially different) sort on a subset of data.
+	$tags_sorted = apply_filters( 'tag_cloud_sort', $tags, $args );
-	if ( 'name' == $orderby )
+	if ( $tags_sorted != $tags  ) { // the tags have been sorted by a plugin
-		uasort( $tags, create_function('$a, $b', 'return strnatcasecmp($a->name, $b->name);') );
+		$tags = $tags_sorted;
-	else
+		unset($tags_sorted);
-		uasort( $tags, create_function('$a, $b', 'return ($a->count > $b->count);') );
+	} else {
+		if ( 'RAND' == $order ) {
-$tags = apply_filters( 'tag_cloud_sort', $tags, $args );
+			shuffle($tags);
+		} else {
-	if ( 'DESC' == $order )
+			// SQL cannot save you; this is a second (potentially different) sort on a subset of data.
-		$tags = array_reverse( $tags, true );
+			if ( 'name' == $orderby )
-	elseif ( 'RAND' == $order ) {
+				uasort( $tags, create_function('$a, $b', 'return strnatcasecmp($a->name, $b->name);') );
-		$keys = (array) array_rand( $tags, count( $tags ) );
+			else
-		$temp = array();
+				uasort( $tags, create_function('$a, $b', 'return ($a->count > $b->count);') );
-		foreach ( $keys as $key )
-			$temp[$key] = $tags[$key];
+			if ( 'DESC' == $order )
+				$tags = array_reverse( $tags, true );
-		$tags = $temp;
+		}
-		$temp = null;
-		unset( $temp );
 	}
 	if ( $number > 0 )
 		$tags = array_slice($tags, 0, $number);
 	$counts = array();
-	foreach ( (array) $tags as $key => $tag )
+	$real_counts = array(); // For the alt tag
-		$counts[ $key ] = $tag->count;
+	foreach ( (array) $tags as $key => $tag ) {
+		$real_counts[ $key ] = $tag->count;
+		$counts[ $key ] = $topic_count_scale_callback($tag->count);
+	}
 	$min_count = min( $counts );
 	$spread = max( $counts ) - $min_count;
 	if ( $spread <= 0 )
 		$spread = 1;
 		$font_spread = 1;
 	$font_step = $font_spread / $spread;
 	$a = array();
-	$rel = ( is_object( $wp_rewrite ) && $wp_rewrite->using_permalinks() ) ? ' rel="tag"' : '';
 	foreach ( $tags as $key => $tag ) {
 		$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( $count ) ) . "'$rel style='font-size: " .
+		$a[] = "<a href='$tag_link' class='tag-link-$tag_id' title='" . esc_attr( $topic_count_text_callback( $real_count ) ) . "' style='font-size: " .
 			( $smallest + ( ( $count - $min_count ) * $font_step ) )
 			. "$unit;'>$tag_name</a>";
 	}
 	switch ( $format ) :
 		$return = "<ul class='wp-tag-cloud'>\n\t<li>";
 		$return .= join( "</li>\n\t<li>", $a );
 		$return .= "</li>\n</ul>\n";
 		break;
 	default :
-		$return = join( "\n", $a );
+		$return = join( $separator, $a );
 		break;
 	endswitch;
 if ( $filter )
 		return apply_filters( 'wp_generate_tag_cloud', $return, $tags, $args );
 function get_the_terms( $id = 0, $taxonomy ) {
 	global $post;
 	$id = (int) $id;
-	if ( ! $id && ! in_the_loop() )
+	if ( !$id ) {
-		return false; // in-the-loop function
+		if ( !$post->ID )
+			return false;
-	if ( !$id )
+		else
-		$id = (int) $post->ID;
+			$id = (int) $post->ID;
+	}
 	$terms = get_object_term_cache( $id, $taxonomy );
 	if ( false === $terms )
 		$terms = wp_get_object_terms( $id, $taxonomy );
 	return $terms;
 }
 /**
-* Retrieve terms as a list with specified format.
+* Retrieve a post's terms as a list with specified format.
 *
 * @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 string
 * @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.
 */
-function the_terms( $id, $taxonomy, $before = '', $sep = '', $after = '' ) {
+function the_terms( $id, $taxonomy, $before = '', $sep = ', ', $after = '' ) {
-	$return = get_the_term_list( $id, $taxonomy, $before, $sep, $after );
+	$term_list = get_the_term_list( $id, $taxonomy, $before, $sep, $after );
-	if ( is_wp_error( $return ) )
+	if ( is_wp_error( $term_list ) )
 		return false;
-	else
-		echo $return;
+	echo apply_filters('the_terms', $term_list, $taxonomy, $before, $sep, $after);
 }
 /**
 * Check if the current post has any of given tags.
 *

branch	wordpress
changeset 132	4d4862461b8d
parent 109	03b0d1493584