Changeset 10213

Timestamp:

12/16/2008 11:50:39 PM (16 years ago)

Author:

ryan

Message:

Don't cache filtered post objects. Set filter when getting sample permalink. Props brianwhite. fixes #8526 for trunk

Location:

trunk

Files:

• wp-admin/includes/post.php (modified) (2 diffs)
• wp-includes/link-template.php (modified) (1 diff)
• wp-includes/post.php (modified) (3 diffs)

trunk/wp-admin/includes/post.php

@@ -910 +910 @@
     }
 
+    $post->filter = 'sample'; 
+
     $permalink = get_permalink($post, true);
 
@@ -927 +929 @@
     $post->post_date = $original_date;
     $post->post_name = $original_name;
+    unset($post->filter);
+
     return $permalink;
 }

trunk/wp-includes/link-template.php

@@ -93 +93 @@
     );
 
-    $post = &get_post($id);
+    if ( is_object($id) && isset($id->filter) && 'sample' == $id->filter )
+        $post = $id;
+    else
+        $post = &get_post($id);
 
     if ( empty($post->ID) ) return false;

trunk/wp-includes/post.php

@@ -216 +216 @@
         else
             return $null;
-    } elseif ( is_object($post) ) {
+    } elseif ( is_object($post) && empty($post->filter) ) {
         _get_post_ancestors($post);
         wp_cache_add($post->ID, $post, 'posts');
         $_post = &$post;
     } else {
+        if ( is_object($post) )
+            $post = $post->ID;
         $post = (int) $post;
         if ( ! $_post = wp_cache_get($post, 'posts') ) {
@@ -793 +795 @@
         foreach ( array_keys(get_object_vars($post)) as $field )
             $post->$field = sanitize_post_field($field, $post->$field, $post->ID, $context);
+        $post->filter = $context;
     } else {
         if ( !isset($post['ID']) )
@@ -798 +801 @@
         foreach ( array_keys($post) as $field )
             $post[$field] = sanitize_post_field($field, $post[$field], $post['ID'], $context);
-    }
+        $post['filter'] = $context;
+    }
+
     return $post;
 }