Changeset 6074

Timestamp:

09/11/07 18:06:52 (1 year ago)

Author:

ryan

Message:

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

Files:

• trunk/wp-includes/general-template.php (modified) (2 diffs)
• trunk/wp-includes/query.php (modified) (5 diffs)

trunk/wp-includes/general-template.php

@@ -276 +276 @@
-                return strip_tags($my_cat_name);
-        }
+    } else if ( is_tag() ) {
+        return single_tag_title($prefix, $display);
-    }
-}
@@ -281 +283 @@
-
-function single_tag_title($prefix = '', $display = true ) {
+    if ( !is_tag() )
+        return;
+
-    $tag_id = intval( get_query_var('tag_id') );
+
-    if ( !empty($tag_id) ) {
-
+, OBJECT, 'display'
-        $my_tag_name = apply_filters('single_tag_title', $my_tag->name);
-        if ( !empty($my_tag_name) ) {
-            if ( $display )
-.strip_tags($my_tag_name)
+ . $my_tag_name
-            else
-strip_tags($my_tag_name)
+$my_tag_name
-        }
-    }

trunk/wp-includes/query.php

@@ -606 +606 @@
-            }
-
-m
+n
-                $qv['tag_slug__and'] = array();
-            } else {
@@ -1027 +1027 @@
-            $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'];
-        }
-
@@ -1034 +1037 @@
-            $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'];
-        }
-
@@ -1042 +1048 @@
-                $whichcat .= " AND $wpdb->posts.ID NOT IN ($out_posts)";
-            }
+        }
+
+        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'];
-        }
-
@@ -1051 +1069 @@
-                $count++;
-            }
+            $reqtag = is_term( $q['tag_slug__and'][0], 'post_tag' );
+            if ( !empty($reqtag) )
+                $q['tag_id'] = $reqtag['term_id'];
-        }
-