Changeset 22635

Timestamp:

11/17/2012 03:14:48 PM (12 years ago)

Author:

ryan

Message:

Always return a raw filtered post object from WP_Post::get_instance().

Props kovshenin, scribu, ntm
fixes #22448

File:

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

trunk/wp-includes/post.php

@@ -569 +569 @@
 
         $post_id = (int) $post_id;
-        if ( !$post_id )
+        if ( ! $post_id )
             return false;
 
-        if ( ! $_post = wp_cache_get( $post_id, 'posts' ) ) {
+        $_post = wp_cache_get( $post_id, 'posts' );
+
+        if ( ! $_post ) {
             $_post = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->posts WHERE ID = %d LIMIT 1", $post_id ) );
 
@@ -580 +582 @@
             $_post = sanitize_post( $_post, 'raw' );
             wp_cache_add( $_post->ID, $_post, 'posts' );
+        } elseif ( empty( $_post->filter ) ) {
+            $_post = sanitize_post( $_post, 'raw' );
         }