Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-06-22 21:04:57 +02:00
Code Issues Projects Releases Wiki Activity

Set tag_id to first tag in multi tag queries. Have single_cat_title() fallback to single_tag_title() if is_tag so that existing category templates will work with tags. fixes #4506

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@6074 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2007-09-11 18:06:52 +00:00
parent 9fbbf54462
commit 368b18d383
2 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
wp-includes/general-template.php
View File

@ -275,20 +275,26 @@ function single_cat_title($prefix = '', $display = true ) {
else
return strip_tags($my_cat_name);
}
} else if ( is_tag() ) {
return single_tag_title($prefix, $display);
}
}
function single_tag_title($prefix = '', $display = true ) {
if ( !is_tag() )
return;
$tag_id = intval( get_query_var('tag_id') );
if ( !empty($tag_id) ) {
$my_tag = &get_term($tag_id, 'post_tag');
$my_tag = &get_term($tag_id, 'post_tag', OBJECT, 'display');
$my_tag_name = apply_filters('single_tag_title', $my_tag->name);
if ( !empty($my_tag_name) ) {
if ( $display )
echo $prefix.strip_tags($my_tag_name);
echo $prefix . $my_tag_name;
else
return strip_tags($my_tag_name);
return $my_tag_name;
}
}
}

23
wp-includes/query.php
View File

@ -605,7 +605,7 @@ class WP_Query {
$this->is_tag = true;
}
if ( !is_array($qv['tag_slug__and']) || empty($qv['tag_slug__amd']) ) {
if ( !is_array($qv['tag_slug__and']) || empty($qv['tag_slug__and']) ) {
$qv['tag_slug__and'] = array();
} else {
$qv['tag_slug__and'] = array_map('sanitize_title', $qv['tag_slug__and']);
@ -1026,6 +1026,9 @@ class WP_Query {
$whichcat .= " AND $wpdb->term_taxonomy.taxonomy = 'post_tag' ";
$include_tags = "'" . implode("', '", $q['tag__in']) . "'";
$whichcat .= " AND $wpdb->term_taxonomy.term_id IN ($include_tags) ";
$reqtag = is_term( $q['tag__in'][0], 'post_tag' );
if ( !empty($reqtag) )
$q['tag_id'] = $reqtag['term_id'];
}
if ( !empty($q['tag_slug__in']) ) {
@ -1033,6 +1036,9 @@ class WP_Query {
$whichcat .= " AND $wpdb->term_taxonomy.taxonomy = 'post_tag' ";
$include_tags = "'" . implode("', '", $q['tag_slug__in']) . "'";
$whichcat .= " AND $wpdb->terms.slug IN ($include_tags) ";
$reqtag = is_term( $q['tag_slug__in'][0], 'post_tag' );
if ( !empty($reqtag) )
$q['tag_id'] = $reqtag['term_id'];
}
if ( !empty($q['tag__not_in']) ) {
@ -1043,6 +1049,18 @@ class WP_Query {
}
}
if ( !empty($q['tag__and']) ) {
$count = 0;
foreach ( $q['tag__and'] as $tag_and ) {
$join .= " LEFT JOIN $wpdb->term_relationships AS tr$count ON ($wpdb->posts.ID = tr$count.object_id) LEFT JOIN $wpdb->term_taxonomy AS tt$count ON (tr$count.term_taxonomy_id = tt$count.term_taxonomy_id) ";
$whichcat .= " AND tt$count.term_id = '$tag_and' ";
$count++;
}
$reqtag = is_term( $q['tag__and'][0], 'post_tag' );
if ( !empty($reqtag) )
$q['tag_id'] = $reqtag['term_id'];
}
if ( !empty($q['tag_slug__and']) ) {
$count = 0;
foreach ( $q['tag_slug__and'] as $tag_and ) {
@ -1050,6 +1068,9 @@ class WP_Query {
$whichcat .= " AND term$count.slug = '$tag_and' ";
$count++;
}
$reqtag = is_term( $q['tag_slug__and'][0], 'post_tag' );
if ( !empty($reqtag) )
$q['tag_id'] = $reqtag['term_id'];
}
// Author/user stuff