WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: http://svn.automattic.com/wordpress/trunk@15586 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
markjaquith 2010-09-07 04:29:00 +00:00
parent 722fde708c
commit 48ca617449
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-includes/classes.php
View File

@ -1340,9 +1340,9 @@ class Walker_Category extends Walker {
function start_el(&$output, $category, $depth, $args) {
extract($args);
$cat_name = esc_attr( $category->name);
$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

8
wp-includes/taxonomy.php
View File

@ -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);