Changeset 16114

Timestamp:

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

Author:

scribu

Message:

use get_queried_object() wrappers throughout. See #14015

Location:

trunk/wp-includes

Files:

• admin-bar.php (modified) (1 diff)
• category-template.php (modified) (3 diffs)
• general-template.php (modified) (6 diffs)
• link-template.php (modified) (1 diff)
• theme.php (modified) (4 diffs)

trunk/wp-includes/admin-bar.php

@@ -174 +174 @@
  */
 function wp_admin_bar_edit_menu () {
-    global $wp_admin_bar, $wp_query;
-
-    $current_object = $wp_query->get_queried_object();
+    global $wp_admin_bar;
+
+    $current_object = get_queried_object();
 
     if ( empty($current_object) )

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;

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 ));

trunk/wp-includes/link-template.php

@@ -717 +717 @@
 function edit_term_link( $link = '', $before = '', $after = '', $term = null, $echo = true ) {
     if ( is_null( $term ) ) {
-        global $wp_query;
-        $term = $wp_query->get_queried_object();
+        $term = get_queried_object();
     }
 

trunk/wp-includes/theme.php

@@ -856 +856 @@
  */
 function get_tag_template() {
-    global $wp_query;
-
-    $tag = $wp_query->get_queried_object();
+    $tag = get_queried_object();
     $tag_name = $tag->slug;
     $tag_id = $tag->term_id;
@@ -962 +960 @@
  */
 function get_page_template() {
-    global $wp_query;
-
-    $id = (int) $wp_query->get_queried_object_id();
+    $id = get_queried_object_id();
     $template = get_post_meta($id, '_wp_page_template', true);
     $pagename = get_query_var('pagename');
@@ -970 +966 @@
     if ( !$pagename && $id > 0 ) {
         // If a static page is set as the front page, $pagename will not be set. Retrieve it from the queried object
-        $post = $wp_query->get_queried_object();
+        $post = get_queried_object();
         $pagename = $post->post_name;
     }
@@ -1019 +1015 @@
  */
 function get_single_template() {
-    global $wp_query;
-
-    $object = $wp_query->get_queried_object();
+    $object = get_queried_object();
     $templates = array('single-' . $object->post_type . '.php', 'single.php');