Changeset 5235

Timestamp:

04/10/2007 09:23:11 PM (19 years ago)

Author:

ryan

Message:

Change get_the_tags() to return an array of tags. Move tag list code to the_tags(). fixes #4123

File:

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

trunk/wp-includes/category-template.php

@@ -39 +39 @@
     }
     return apply_filters('category_link', $catlink, $category_id);
-}
-
-function get_tag_link( $tag_id ) {
-    global $wp_rewrite;
-    $catlink = $wp_rewrite->get_tag_permastruct();
-
-    $category = &get_category($tag_id);
-    $category_nicename = $category->category_nicename;
-
-    if ( empty($catlink) ) {
-        $file = get_option('home') . '/';
-        $catlink = $file . '?tag=' . $category_nicename;
-    } else {
-
-        $catlink = str_replace('%tag%', $category_nicename, $catlink);
-        $catlink = get_option('home') . user_trailingslashit($catlink, 'category');
-    }
-    return apply_filters('tag_link', $catlink, $tag_id);
 }
 
@@ -179 +161 @@
 }
 
-function get_the_tags( $before, $sep, $after ) {
-    global $post;
-    if ( !$post )
-        return false; // in-the-loop function
-
-    $tags = wp_get_post_tags( $post->ID );
-    if ( empty( $tags ) )
-        return false;
-    
-    $return = $before;
-    foreach ( $tags as $tag )
-        $tag_links[] = '<a href="' . get_tag_link($tag->cat_ID) . '">' . $tag->cat_name . '</a>';
-
-    $tag_links = join( $sep, $tag_links );
-    $tag_links = apply_filters( 'the_tags', $tag_links );
-    $return .= $tag_links;
-
-    $return .= $after;
-    return $return;
-}
-
-function the_tags( $before = 'Tags: ', $sep = ', ', $after = '' ) {
-    echo get_the_tags( $before, $sep, $after );
-}
-
 function category_description($category = 0) {
     global $cat;
@@ -410 +367 @@
 }
 
+//
+// Tags
+//
+
+function get_tag_link( $tag_id ) {
+    global $wp_rewrite;
+    $catlink = $wp_rewrite->get_tag_permastruct();
+
+    $category = &get_category($tag_id);
+    $category_nicename = $category->category_nicename;
+
+    if ( empty($catlink) ) {
+        $file = get_option('home') . '/';
+        $catlink = $file . '?tag=' . $category_nicename;
+    } else {
+
+        $catlink = str_replace('%tag%', $category_nicename, $catlink);
+        $catlink = get_option('home') . user_trailingslashit($catlink, 'category');
+    }
+    return apply_filters('tag_link', $catlink, $tag_id);
+}
+
+function get_the_tags( $id = 0 ) {
+    global $post; 
+ 
+    $id = (int) $id;
+
+    if ( ! $id && ! in_the_loop() ) 
+        return false; // in-the-loop function 
+ 
+    if ( !$id ) 
+        $id = (int) $post->ID;
+
+    $tags = wp_get_post_tags( $id );
+    $tags = apply_filters( 'get_the_tags', $tags );
+    if ( empty( $tags ) ) 
+        return false; 
+    return $tags; 
+}
+
+function the_tags( $before = 'Tags: ', $sep = ', ', $after = '' ) {
+    $tags = get_the_tags();
+
+    if ( empty( $tags ) )
+        return false;
+    
+    $tag_list = $before;
+    foreach ( $tags as $tag )
+        $tag_links[] = '<a href="' . get_tag_link($tag->cat_ID) . '">' . $tag->cat_name . '</a>';
+
+    $tag_links = join( $sep, $tag_links );
+    $tag_links = apply_filters( 'the_tags', $tag_links );
+    $tag_list .= $tag_links;
+
+    $tag_list .= $after;
+
+    echo $tag_list;
+}
+
 ?>