Changeset 15586 for trunk/wp-includes/taxonomy.php

Timestamp:

09/07/2010 04:29:00 AM (13 years ago)

Author:

markjaquith

Message:

Make the second (taxonomy) parameter for get_term_link() optional if you pass in a term object as the first argument (which has the taxonomy in it). fixes #13081. props scribu

File:

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

trunk/wp-includes/taxonomy.php

@@ -2482 +2482 @@
  *
  * @param object|int|string $term
- * @param string $taxonomy
+ * @param string $taxonomy (optional if $term is object)
  * @return string HTML link to taxonomy term archive
  */
-function get_term_link( $term, $taxonomy ) {
+function get_term_link( $term, $taxonomy = '') {
     global $wp_rewrite;
 
@@ -2501 +2501 @@
     if ( is_wp_error( $term ) )
         return $term;
+
+    $taxonomy = $term->taxonomy;
 
     // use legacy functions for core taxonomies until they are fully plugged in
@@ -2598 +2600 @@
 
         foreach ( $terms as $term )
-            $links[] = "<a href='" . esc_attr(get_term_link($term, $taxonomy)) . "'>$term->name</a>";
+            $links[] = "<a href='" . esc_attr( get_term_link($term) ) . "'>$term->name</a>";
 
         if ( $links )