Changeset 15613 for trunk/wp-includes/general-template.php

Timestamp:

09/13/2010 04:44:14 PM (14 years ago)

Author:

scribu

Message:

Clean up taxonomy queries in WP_Query. See #12891

File:

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

trunk/wp-includes/general-template.php

@@ -1590 +1590 @@
  */
 function feed_links_extra( $args = array() ) {
+    global $wp_query;
+
     $defaults = array(
         /* translators: Separator between blog name and feed type in feed links */
@@ -1615 +1617 @@
         }
     } elseif ( is_category() ) {
-        $cat_id = intval( get_query_var('cat') );
-
-        $title = esc_attr(sprintf( $args['cattitle'], get_bloginfo('name'), $args['separator'], get_cat_name( $cat_id ) ));
-        $href = get_category_feed_link( $cat_id );
+        $term = $wp_query->get_queried_object();
+
+        $title = esc_attr(sprintf( $args['cattitle'], get_bloginfo('name'), $args['separator'], $term->name ));
+        $href = get_category_feed_link( $term->term_id );
     } elseif ( is_tag() ) {
-        $tag_id = intval( get_query_var('tag_id') );
-        $tag = get_tag( $tag_id );
-
-        $title = esc_attr(sprintf( $args['tagtitle'], get_bloginfo('name'), $args['separator'], $tag->name ));
-        $href = get_tag_feed_link( $tag_id );
+        $term = $wp_query->get_queried_object();
+
+        $title = esc_attr(sprintf( $args['tagtitle'], get_bloginfo('name'), $args['separator'], $term->name ));
+        $href = get_tag_feed_link( $term->term_id );
     } elseif ( is_author() ) {
         $author_id = intval( get_query_var('author') );