Changeset 7520 for trunk/wp-includes/category-template.php

Timestamp:

03/26/2008 06:37:19 AM (17 years ago)

Author:

ryan

Message:

Taxonomy links and template tags from andy. see #6357

File:

• trunk/wp-includes/category-template.php (modified) (2 diffs)

trunk/wp-includes/category-template.php

@@ -476 +476 @@
 
 function get_the_tags( $id = 0 ) {
+    return apply_filters( 'get_the_tags', get_the_terms($id, 'post_tag') );
+}
+
+function get_the_tag_list( $before = '', $sep = '', $after = '' ) {
+    return apply_filters( 'the_tags', get_the_term_list(0, 'post_tag', $before, $sep, $after) );
+}
+
+function the_tags( $before = 'Tags: ', $sep = ', ', $after = '' ) {
+    return the_terms( 0, 'post_tag', $before, $sep, $after );
+}
+
+function get_the_terms( $id = 0, $taxonomy ) {
     global $post;
 
@@ -486 +498 @@
         $id = (int) $post->ID;
 
-    $tags = get_object_term_cache($id, 'post_tag');
-    if ( false === $tags )
-        $tags = wp_get_object_terms($id, 'post_tag');
-
-    $tags = apply_filters( 'get_the_tags', $tags );
-    if ( empty( $tags ) )
+    $terms = get_object_term_cache($id, $taxonomy);
+    if ( false === $terms )
+        $terms = wp_get_object_terms($id, $taxonomy);
+
+    if ( empty( $terms ) )
         return false;
-    return $tags;
-}
-
-function get_the_tag_list( $before = '', $sep = '', $after = '' ) {
-    $tags = get_the_tags();
-
-    if ( empty( $tags ) )
+
+    return $terms;
+}
+
+function get_the_term_list( $id = 0, $taxonomy, $before = '', $sep = '', $after = '' ) {
+    $terms = get_the_terms($id, $taxonomy);
+
+    if ( is_wp_error($terms) )
+        return $terms;
+
+    if ( empty( $terms ) )
         return false;
 
-    $tag_list = $before;
-    foreach ( $tags as $tag ) {
-        $link = get_tag_link($tag->term_id);
+    foreach ( $terms as $term ) {
+        $link = get_term_link($term, $taxonomy);
         if ( is_wp_error( $link ) )
             return $link;
-        $tag_links[] = '<a href="' . $link . '" rel="tag">' . $tag->name . '</a>';
-    }
-
-    $tag_links = join( $sep, $tag_links );
-    $tag_links = apply_filters( 'the_tags', $tag_links );
-    $tag_list .= $tag_links;
-
-    $tag_list .= $after;
-
-    return $tag_list;
-}
-
-function the_tags( $before = 'Tags: ', $sep = ', ', $after = '' ) {
-    $return = get_the_tag_list($before, $sep, $after);
+        $term_links[] = '<a href="' . $link . '" rel="tag">' . $term->name . '</a>';
+    }
+
+    $term_links = apply_filters( "term_links-$taxonomy", $term_links );
+
+    return $before . join($sep, $term_links) . $after;
+}
+
+function the_terms( $id, $taxonomy, $before = '', $sep = '', $after = '' ) {
+    $return = get_the_term_list($id, $taxonomy, $before, $sep, $after);
     if ( is_wp_error( $return ) )
         return false;