Changeset 16114 for trunk/wp-includes/theme.php

Timestamp:

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

Author:

scribu

Message:

use get_queried_object() wrappers throughout. See #14015

File:

• trunk/wp-includes/theme.php (modified) (4 diffs)

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