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

Timestamp:

05/23/2007 03:57:20 AM (19 years ago)

Author:

ryan

Message:

Add get_terms() and get_term(). Move more of tagging to taxonomy. see #4189

File:

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

trunk/wp-includes/category-template.php

@@ -312 +312 @@
         $counts = $tag_links = array();
         foreach ( (array) $tags as $tag ) {
-                $counts[$tag->cat_name] = $tag->tag_count;
-                $tag_links[$tag->cat_name] = get_tag_link( $tag->cat_ID );
+                $counts[$tag->name] = $tag->count;
+                $tag_links[$tag->name] = get_tag_link( $tag->term_id );
         }
 
@@ -385 +385 @@
 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;
+        $taglink = $wp_rewrite->get_tag_permastruct();
+
+        $tag = &get_term($tag_id, 'post_tag');
+        $slug = $tag->slug;
 
         if ( empty($catlink) ) {
                 $file = get_option('home') . '/';
-                $catlink = $file . '?tag=' . $category_nicename;
+                $taglink = $file . '?tag=' . $slug;
         } else {
-
-                $catlink = str_replace('%tag%', $category_nicename, $catlink);
-                $catlink = get_option('home') . user_trailingslashit($catlink, 'category');
-        }
-        return apply_filters('tag_link', $catlink, $tag_id);
+                $taglink = str_replace('%tag%', $slug, $taglink);
+                $taglink = get_option('home') . user_trailingslashit($taglink, 'category');
+        }
+        return apply_filters('tag_link', $taglink, $tag_id);
 }
 
@@ -427 +426 @@
         $tag_list = $before;
         foreach ( $tags as $tag )
-                $tag_links[] = '<a href="' . get_tag_link($tag->cat_ID) . '">' . $tag->cat_name . '</a>';
+                $tag_links[] = '<a href="' . get_tag_link($tag->term_id) . '">' . $tag->slug . '</a>';
 
         $tag_links = join( $sep, $tag_links );