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

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

git-svn-id: http://svn.automattic.com/wordpress/trunk@11324 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2009-05-14 04:09:01 +00:00
parent 1354d0660a
commit 0d81b0ea1a
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-includes/category-template.php
View File

@ -887,7 +887,7 @@ function get_the_term_list( $id = 0, $taxonomy, $before = '', $sep = '', $after
return false; return false;
foreach ( $terms as $term ) { foreach ( $terms as $term ) {
$link = get_term_link( $term->term_id, $taxonomy ); $link = get_term_link( $term, $taxonomy );
if ( is_wp_error( $link ) ) if ( is_wp_error( $link ) )
return $link; return $link;
$term_links[] = '<a href="' . $link . '" rel="tag">' . $term->name . '</a>'; $term_links[] = '<a href="' . $link . '" rel="tag">' . $term->name . '</a>';

24
wp-includes/taxonomy.php
View File

@ -2151,24 +2151,28 @@ function _update_post_term_count( $terms ) {
* *
* @since 2.5.0 * @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 * @param string $taxonomy
* @return string HTML link to taxonomy term archive * @return string HTML link to taxonomy term archive
*/ */
function get_term_link( $term_id, $taxonomy ) { function get_term_link( $term, $taxonomy ) {
global $wp_rewrite; 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 // use legacy functions for core taxonomies until they are fully plugged in
if ( $taxonomy == 'category' ) if ( $taxonomy == 'category' )
return get_category_link((int) $term_id); return get_category_link((int) $term->term_id);
if ( $taxonomy == 'post_tag' ) if ( $taxonomy == 'post_tag' )
return get_tag_link((int) $term_id); return get_tag_link((int) $term->term_id);
$term = &get_term($term_id, $taxonomy);
if ( is_wp_error( $term ) )
return $term;
$termlink = $wp_rewrite->get_extra_permastruct($taxonomy); $termlink = $wp_rewrite->get_extra_permastruct($taxonomy);