Changeset 16114 for trunk/wp-includes/category-template.php

Timestamp:

10/31/2010 11:02:17 AM (14 years ago)

Author:

scribu

Message:

use get_queried_object() wrappers throughout. See #14015

File:

• trunk/wp-includes/category-template.php (modified) (3 diffs)

trunk/wp-includes/category-template.php

@@ -466 +466 @@
         }
     } else {
-        global $wp_query;
-
         if( !empty( $show_option_all ) )
             if ( 'list' == $style )
@@ -475 +473 @@
 
         if ( empty( $r['current_category'] ) && ( is_category() || is_tax() ) )
-            $r['current_category'] = $wp_query->get_queried_object_id();
+            $r['current_category'] = get_queried_object_id();
 
         if ( $hierarchical )
@@ -1026 +1024 @@
 function term_description( $term = 0, $taxonomy = 'post_tag' ) {
     if ( !$term && ( is_tax() || is_tag() || is_category() ) ) {
-        global $wp_query;
-        $term = $wp_query->get_queried_object();
+        $term = get_queried_object();
         $taxonomy = $term->taxonomy;
         $term = $term->term_id;