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

Timestamp:

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

Author:

scribu

Message:

use get_queried_object() wrappers throughout. See #14015

File:

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

trunk/wp-includes/general-template.php

@@ -527 +527 @@
  */
 function wp_title($sep = '»', $display = true, $seplocation = '') {
-        global $wpdb, $wp_locale, $wp_query;
+        global $wpdb, $wp_locale;
 
         $m = get_query_var('m');
@@ -556 +556 @@
         // If there's an author
         if ( is_author() ) {
-                $author = $wp_query->get_queried_object();
+                $author = get_queried_object();
                 $title = $author->display_name;
         }
@@ -634 +634 @@
  */
 function single_post_title($prefix = '', $display = true) {
-        global $wp_query, $post;
+        global $post;
 
         if ( ! $post )
-                $_post = $wp_query->get_queried_object();
+                $_post = get_queried_object();
         else
                 $_post = $post;
@@ -737 +737 @@
  */
 function single_term_title( $prefix = '', $display = true ) {
-        global $wp_query;
-
-        $term = $wp_query->get_queried_object();
+        $term = get_queried_object();
 
         if ( !$term )
@@ -1631 +1629 @@
  */
 function feed_links_extra( $args = array() ) {
-        global $wp_query;
-
         $defaults = array(
                 /* translators: Separator between blog name and feed type in feed links */
@@ -1658 +1654 @@
                 }
         } elseif ( is_category() ) {
-                $term = $wp_query->get_queried_object();
+                $term = 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() ) {
-                $term = $wp_query->get_queried_object();
+                $term = get_queried_object();
 
                 $title = esc_attr(sprintf( $args['tagtitle'], get_bloginfo('name'), $args['separator'], $term->name ));