Changeset 7941

Timestamp:

05/16/2008 03:57:09 AM (18 years ago)

Author:

matt

Message:

get_queried_object should not return an array of terms, and wp_title should check is_tax. Hat tip: andy

Location:

trunk/wp-includes

Files:

• general-template.php (modified) (1 diff)
• query.php (modified) (1 diff)

trunk/wp-includes/general-template.php

@@ -232 +232 @@
                 $post = $wp_query->get_queried_object();
                 $title = strip_tags( apply_filters( 'single_post_title', $post->post_title ) );
+        }
+
+        // If there's a taxonomy
+        if ( is_tax() ) {
+                $taxonomy = get_query_var( 'taxonomy' );
+                $tax = get_taxonomy( $taxonomy );
+                $tax = $tax->label;
+                $term = $wp_query->get_queried_object();
+                $term = $term->name;
+                if ( 'right' == $seplocation )
+                        $title = "$term $sep $tax";
+                else
+                        $title = "$tax $sep $term";
         }
 

trunk/wp-includes/query.php

@@ -1611 +1611 @@
                         $slug = $this->get('term');
                         $term = &get_terms($tax, array('slug'=>$slug));
-                        if ( is_wp_error($term) )
+                        if ( is_wp_error($term) || empty($term) )
                                 return $term;
+                        $term = $term[0];
                         $this->queried_object = $term;
                         $this->queried_object_id = $term->term_id;