X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/449d082fcc4873c1f7d363a0d9f7409be7f6e77d..f8ce8fee333796f41d394479265f31b87bd6e436:/wp-includes/category-template.php diff --git a/wp-includes/category-template.php b/wp-includes/category-template.php index 5d2240d0..db55a12c 100644 --- a/wp-includes/category-template.php +++ b/wp-includes/category-template.php @@ -6,40 +6,6 @@ * @subpackage Template */ -/** - * Retrieve category children list separated before and after the term IDs. - * - * @since 1.2.0 - * - * @param int $id Category ID to retrieve children. - * @param string $before Optional. Prepend before category term ID. - * @param string $after Optional, default is empty string. Append after category term ID. - * @param array $visited Optional. Category Term IDs that have already been added. - * @return string - */ -function get_category_children( $id, $before = '/', $after = '', $visited = array() ) { - if ( 0 == $id ) - return ''; - - $chain = ''; - /** TODO: consult hierarchy */ - $cat_ids = get_all_category_ids(); - foreach ( (array) $cat_ids as $cat_id ) { - if ( $cat_id == $id ) - continue; - - $category = get_category( $cat_id ); - if ( is_wp_error( $category ) ) - return $category; - if ( $category->parent == $id && !in_array( $category->term_id, $visited ) ) { - $visited[] = $category->term_id; - $chain .= $before.$category->term_id.$after; - $chain .= get_category_children( $category->term_id, $before, $after ); - } - } - return $chain; -} - /** * Retrieve category link URL. * @@ -54,8 +20,7 @@ function get_category_link( $category_id ) { $catlink = $wp_rewrite->get_category_permastruct(); if ( empty( $catlink ) ) { - $file = get_option( 'home' ) . '/'; - $catlink = $file . '?cat=' . $category_id; + $catlink = home_url('?cat=' . $category_id); } else { $category = &get_category( $category_id ); if ( is_wp_error( $category ) ) @@ -68,7 +33,7 @@ function get_category_link( $category_id ) { $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' ); + $catlink = home_url( user_trailingslashit( $catlink, 'category' ) ); } return apply_filters( 'category_link', $catlink, $category_id ); } @@ -102,7 +67,7 @@ function get_category_parents( $id, $link = false, $separator = '/', $nicename = } if ( $link ) - $chain .= 'cat_name ) . '">'.$name.'' . $separator; + $chain .= 'cat_name ) ) . '">'.$name.'' . $separator; else $chain .= $name.$separator; return $chain; @@ -210,6 +175,9 @@ function get_the_category_by_ID( $cat_ID ) { function get_the_category_list( $separator = '', $parents='', $post_id = false ) { global $wp_rewrite; $categories = get_the_category( $post_id ); + if ( !is_object_in_taxonomy( get_post_type( $post_id ), 'category' ) ) + return apply_filters( 'the_category', '', $separator, $parents ); + if ( empty( $categories ) ) return apply_filters( 'the_category', __( 'Uncategorized' ), $separator, $parents ); @@ -224,17 +192,17 @@ function get_the_category_list( $separator = '', $parents='', $post_id = false ) case 'multiple': if ( $category->parent ) $thelist .= get_category_parents( $category->parent, true, $separator ); - $thelist .= 'name ) . '" ' . $rel . '>' . $category->name.''; + $thelist .= 'name ) ) . '" ' . $rel . '>' . $category->name.''; break; case 'single': - $thelist .= 'name ) . '" ' . $rel . '>'; + $thelist .= 'name ) ) . '" ' . $rel . '>'; if ( $category->parent ) $thelist .= get_category_parents( $category->parent, false, $separator ); $thelist .= $category->name.''; break; case '': default: - $thelist .= 'name ) . '" ' . $rel . '>' . $category->cat_name.''; + $thelist .= 'name ) ) . '" ' . $rel . '>' . $category->cat_name.''; } } $thelist .= ''; @@ -242,22 +210,22 @@ function get_the_category_list( $separator = '', $parents='', $post_id = false ) $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 .= 'name ) . '" ' . $rel . '>' . $category->cat_name.''; + $thelist .= 'name ) ) . '" ' . $rel . '>' . $category->cat_name.''; break; case 'single': - $thelist .= 'name ) . '" ' . $rel . '>'; + $thelist .= 'name ) ) . '" ' . $rel . '>'; if ( $category->parent ) $thelist .= get_category_parents( $category->parent, false, $separator ); $thelist .= "$category->cat_name"; break; case '': default: - $thelist .= 'name ) . '" ' . $rel . '>' . $category->name.''; + $thelist .= 'name ) ) . '" ' . $rel . '>' . $category->name.''; } ++$i; } @@ -327,11 +295,7 @@ function the_category( $separator = '', $parents='', $post_id = false ) { * @return string Category description, available. */ function category_description( $category = 0 ) { - global $cat; - if ( !$category ) - $category = $cat; - - return get_term_field( 'description', $category, 'category' ); + return term_description( $category, 'category' ); } /** @@ -353,9 +317,11 @@ function category_description( $category = 0 ) { * '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. - * 'class' (string) - The class attribute value for selected element. + * 'name' (string) - The name attribute value for select 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 @@ -370,18 +336,31 @@ function category_description( $category = 0 ) { function wp_dropdown_categories( $args = '' ) { $defaults = array( 'show_option_all' => '', 'show_option_none' => '', - 'orderby' => 'ID', 'order' => 'ASC', + 'orderby' => 'id', 'order' => 'ASC', 'show_last_update' => 0, 'show_count' => 0, 'hide_empty' => 1, 'child_of' => 0, 'exclude' => '', 'echo' => 1, 'selected' => 0, 'hierarchical' => 0, - 'name' => 'cat', 'class' => 'postform', - 'depth' => 0, 'tab_index' => 0 + 'name' => 'cat', 'id' => '', + '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 ); @@ -389,11 +368,22 @@ function wp_dropdown_categories( $args = '' ) { if ( (int) $tab_index > 0 ) $tab_index_attribute = " tabindex=\"$tab_index\""; - $categories = get_categories( $r ); + $categories = get_terms( $taxonomy, $r ); + $name = esc_attr( $name ); + $class = esc_attr( $class ); + $id = $id ? esc_attr( $id ) : $name; + + if ( ! $r['hide_if_empty'] || ! empty($categories) ) + $output = "\n"; if ( $show_option_all ) { $show_option_all = apply_filters( 'list_cats', $show_option_all ); @@ -413,8 +403,10 @@ function wp_dropdown_categories( $args = '' ) { $depth = -1; // Flat. $output .= walk_category_dropdown_tree( $categories, $depth, $r ); - $output .= "\n"; } + if ( ! $r['hide_if_empty'] || ! empty($categories) ) + $output .= "\n"; + $output = apply_filters( 'wp_dropdown_cats', $output ); @@ -459,44 +451,53 @@ function wp_dropdown_categories( $args = '' ) { */ function wp_list_categories( $args = '' ) { $defaults = array( - 'show_option_all' => '', 'orderby' => 'name', - 'order' => 'ASC', 'show_last_update' => 0, - 'style' => 'list', 'show_count' => 0, - 'hide_empty' => 1, 'use_desc_for_title' => 1, - 'child_of' => 0, 'feed' => '', 'feed_type' => '', - 'feed_image' => '', 'exclude' => '', 'exclude_tree' => '', 'current_category' => 0, + 'show_option_all' => '', 'show_option_none' => __('No categories'), + 'orderby' => 'name', 'order' => 'ASC', + 'show_last_update' => 0, 'style' => 'list', + 'show_count' => 0, 'hide_empty' => 1, + 'use_desc_for_title' => 1, 'child_of' => 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'] ) ) { + 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 = '
  • ' . $r['title_li'] . '\n"; break; default : - $return = join( "\n", $a ); + $return = join( $separator, $a ); break; endswitch; - return apply_filters( 'wp_generate_tag_cloud', $return, $tags, $args ); + if ( $filter ) + return apply_filters( 'wp_generate_tag_cloud', $return, $tags, $args ); + else + return $return; } // @@ -810,7 +834,7 @@ function get_the_tags( $id = 0 ) { * @return string */ function get_the_tag_list( $before = '', $sep = '', $after = '' ) { - return apply_filters( 'the_tags', get_the_term_list( 0, 'post_tag', $before, $sep, $after ) ); + return apply_filters( 'the_tags', get_the_term_list( 0, 'post_tag', $before, $sep, $after ), $before, $sep, $after); } /** @@ -823,8 +847,41 @@ function get_the_tag_list( $before = '', $sep = '', $after = '' ) { * @param string $after Optional. After list. * @return string */ -function the_tags( $before = 'Tags: ', $sep = ', ', $after = '' ) { - return the_terms( 0, 'post_tag', $before, $sep, $after ); +function the_tags( $before = null, $sep = ', ', $after = '' ) { + if ( null === $before ) + $before = __('Tags: '); + echo get_the_tag_list($before, $sep, $after); +} + +/** + * Retrieve tag description. + * + * @since 2.8 + * + * @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 ); +} + +/** + * Retrieve term description. + * + * @since 2.8 + * + * @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' ) { + if ( !$term && ( is_tax() || is_tag() || is_category() ) ) { + global $wp_query; + $term = $wp_query->get_queried_object(); + $taxonomy = $term->taxonomy; + $term = $term->term_id; + } + $description = get_term_field( 'description', $term, $taxonomy ); + return is_wp_error( $description ) ? '' : $description; } /** @@ -843,11 +900,12 @@ function get_the_terms( $id = 0, $taxonomy ) { $id = (int) $id; - if ( ! $id && ! in_the_loop() ) - return false; // in-the-loop function - - if ( !$id ) - $id = (int) $post->ID; + if ( !$id ) { + if ( !$post->ID ) + return false; + else + $id = (int) $post->ID; + } $terms = get_object_term_cache( $id, $taxonomy ); if ( false === $terms ) @@ -860,11 +918,11 @@ function get_the_terms( $id = 0, $taxonomy ) { } /** - * 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. @@ -904,12 +962,13 @@ function get_the_term_list( $id = 0, $taxonomy, $before = '', $sep = '', $after * @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 = '' ) { - $return = get_the_term_list( $id, $taxonomy, $before, $sep, $after ); - if ( is_wp_error( $return ) ) +function the_terms( $id, $taxonomy, $before = '', $sep = ', ', $after = '' ) { + $term_list = get_the_term_list( $id, $taxonomy, $before, $sep, $after ); + + if ( is_wp_error( $term_list ) ) return false; - else - echo $return; + + echo apply_filters('the_terms', $term_list, $taxonomy, $before, $sep, $after); } /** @@ -947,4 +1006,4 @@ function has_tag( $tag = '', $_post = null ) { return $r; } -?> +?> \ No newline at end of file