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
git-svn-id: https://develop.svn.wordpress.org/trunk@15586 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
parent
ad682bb2dd
commit
e0c7c93fa0
|
@ -1342,7 +1342,7 @@ class Walker_Category extends Walker {
|
|||
|
||||
$cat_name = esc_attr( $category->name );
|
||||
$cat_name = apply_filters( 'list_cats', $cat_name, $category );
|
||||
$link = '<a href="' . get_term_link( $category, $category->taxonomy ) . '" ';
|
||||
$link = '<a href="' . esc_attr( get_term_link($category) ) . '" ';
|
||||
if ( $use_desc_for_title == 0 || empty($category->description) )
|
||||
$link .= 'title="' . sprintf(__( 'View all posts filed under %s' ), $cat_name) . '"';
|
||||
else
|
||||
|
|
|
@ -2481,10 +2481,10 @@ function _update_post_term_count( $terms, $taxonomy ) {
|
|||
* @since 2.5.0
|
||||
*
|
||||
* @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;
|
||||
|
||||
if ( !is_object($term) ) {
|
||||
|
@ -2501,6 +2501,8 @@ function get_term_link( $term, $taxonomy ) {
|
|||
if ( is_wp_error( $term ) )
|
||||
return $term;
|
||||
|
||||
$taxonomy = $term->taxonomy;
|
||||
|
||||
// use legacy functions for core taxonomies until they are fully plugged in
|
||||
if ( $taxonomy == 'category' )
|
||||
return get_category_link((int) $term->term_id);
|
||||
|
@ -2597,7 +2599,7 @@ function get_the_taxonomies($post = 0) {
|
|||
$links = array();
|
||||
|
||||
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 )
|
||||
$taxonomies[$taxonomy] = wp_sprintf($t['template'], $t['label'], $links, $terms);
|
||||
|
|
Loading…
Reference in New Issue