Changeset 12877

Timestamp:

01/27/2010 05:45:49 PM (17 years ago)

Author:

ryan

Message:

Avoid call to setup_postdata(). Use get_queried_object_id(). Props filosofo. fixes #11439

File:

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

trunk/wp-includes/post-template.php

@@ -393 +393 @@
 
         if ( is_single() ) {
-                $wp_query->post = $wp_query->posts[0];
-                setup_postdata($wp_query->post);
-
-                $postID = $wp_query->post->ID;
+                $postID = $wp_query->get_queried_object_id();
+                
                 $classes[] = 'single postid-' . $postID;
 
                 if ( is_attachment() ) {
-                        $mime_type = get_post_mime_type();
+                        $mime_type = get_post_mime_type($postID);
                         $mime_prefix = array( 'application/', 'image/', 'text/', 'audio/', 'video/', 'music/' );
                         $classes[] = 'attachmentid-' . $postID;
@@ -422 +420 @@
                 $classes[] = 'page';
 
-                $wp_query->post = $wp_query->posts[0];
-                setup_postdata($wp_query->post);
-
-                $pageID = $wp_query->post->ID;
+                $pageID = $wp_query->get_queried_object_id();
+
+                $post = get_page($pageID);
 
                 $classes[] = 'page-id-' . $pageID;
 
-                if ( $wpdb->get_var( $wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_parent = %d AND post_type = 'page' LIMIT 1", $pageID) ) )
+                if ( $wpdb->get_var( $wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_parent = %d AND post_type = 'page' AND post_status = 'publish' LIMIT 1", $pageID) ) )
                         $classes[] = 'page-parent';
 
-                if ( $wp_query->post->post_parent ) {
+                if ( $post->post_parent ) {
                         $classes[] = 'page-child';
-                        $classes[] = 'parent-pageid-' . $wp_query->post->post_parent;
+                        $classes[] = 'parent-pageid-' . $post->post_parent;
                 }
                 if ( is_page_template() ) {