Changeset 11324

Timestamp:

05/14/2009 04:09:01 AM (17 years ago)

Author:

ryan

Message:

Revert [11263]. Busted several themes. see #9323

Location:

trunk/wp-includes

Files:

• category-template.php (modified) (1 diff)
• taxonomy.php (modified) (1 diff)

trunk/wp-includes/category-template.php

@@ -888 +888 @@
 
         foreach ( $terms as $term ) {
-                $link = get_term_link( $term->term_id, $taxonomy );
+                $link = get_term_link( $term, $taxonomy );
                 if ( is_wp_error( $link ) )
                         return $link;

trunk/wp-includes/taxonomy.php

@@ -2152 +2152 @@
  * @since 2.5.0
  *
- * @param int $term_id The term id for which to get a link.
+ * @param object|int|string $term
  * @param string $taxonomy
  * @return string HTML link to taxonomy term archive
  */
-function get_term_link( $term_id, $taxonomy ) {
+function get_term_link( $term, $taxonomy ) {
         global $wp_rewrite;
-        $term_id = intval($term_id);
+
+        if ( !is_object($term) ) {
+                if ( is_int($term) ) {
+                        $term = &get_term($term, $taxonomy);
+                } else {
+                        $term = &get_term_by('slug', $term, $taxonomy);
+                }
+        }
+        if ( is_wp_error( $term ) )
+                return $term;
 
         // use legacy functions for core taxonomies until they are fully plugged in
         if ( $taxonomy == 'category' )
-                return get_category_link((int) $term_id);
+                return get_category_link((int) $term->term_id);
         if ( $taxonomy == 'post_tag' )
-                return get_tag_link((int) $term_id);
-        
-        $term = &get_term($term_id, $taxonomy);
-
-        if ( is_wp_error( $term ) )
-                return $term;
+                return get_tag_link((int) $term->term_id);
 
         $termlink = $wp_rewrite->get_extra_permastruct($taxonomy);