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

Get rid of misplaced 'taxonomy_template' filter. Fixes #14740 

git-svn-id: http://svn.automattic.com/wordpress/trunk@16665 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
scribu 2010-12-01 20:16:24 +00:00
parent a9e5cc0817
commit 0c8a8c3655
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
wp-includes/taxonomy.php
View File

@ -2775,6 +2775,7 @@ function get_term_link( $term, $taxonomy = '') {
* 'before' : default is empty string. Display before taxonomies list. * 'before' : default is empty string. Display before taxonomies list.
* 'sep' : default is empty string. Separate every taxonomy with value in this. * 'sep' : default is empty string. Separate every taxonomy with value in this.
* 'after' : default is empty string. Display this after the taxonomies list. * 'after' : default is empty string. Display this after the taxonomies list.
* 'template' : The template to use for displaying the taxonomy terms.
* *
* @since 2.5.0 * @since 2.5.0
* @uses get_the_taxonomies() * @uses get_the_taxonomies()
@ -2787,12 +2788,13 @@ function the_taxonomies($args = array()) {
'before' => '', 'before' => '',
'sep' => ' ', 'sep' => ' ',
'after' => '', 'after' => '',
'template' => '%s: %l.'
); );
$r = wp_parse_args( $args, $defaults ); $r = wp_parse_args( $args, $defaults );
extract( $r, EXTR_SKIP ); extract( $r, EXTR_SKIP );
echo $before . join($sep, get_the_taxonomies($post)) . $after; echo $before . join($sep, get_the_taxonomies($post, $template)) . $after;
} }
/** /**
@ -2804,9 +2806,10 @@ function the_taxonomies($args = array()) {
* @since 2.5.0 * @since 2.5.0
* *
* @param int $post Optional. Post ID or will use Global Post ID (in loop). * @param int $post Optional. Post ID or will use Global Post ID (in loop).
* @param string $template Optional. The template to use for displaying the taxonomy terms.
* @return array * @return array
*/ */
function get_the_taxonomies($post = 0) { function get_the_taxonomies($post = 0, $template = '%s: %l.') {
if ( is_int($post) ) if ( is_int($post) )
$post =& get_post($post); $post =& get_post($post);
elseif ( !is_object($post) ) elseif ( !is_object($post) )
@ -2817,8 +2820,6 @@ function get_the_taxonomies($post = 0) {
if ( !$post ) if ( !$post )
return $taxonomies; return $taxonomies;
$template = apply_filters('taxonomy_template', '%s: %l.');
foreach ( get_object_taxonomies($post) as $taxonomy ) { foreach ( get_object_taxonomies($post) as $taxonomy ) {
$t = (array) get_taxonomy($taxonomy); $t = (array) get_taxonomy($taxonomy);
if ( empty($t['label']) ) if ( empty($t['label']) )