Changeset 7695 for branches/2.5/wp-includes/post.php

Timestamp:

04/16/2008 05:23:40 PM (18 years ago)

Author:

ryan

Message:

Add post ancestors to the cache for the post object. see #6702 for 2.5

File:

• branches/2.5/wp-includes/post.php (modified) (5 diffs)

branches/2.5/wp-includes/post.php

@@ -166 +166 @@
             return $null;
     } elseif ( is_object($post) ) {
+        _get_post_ancestors($post);
         wp_cache_add($post->ID, $post, 'posts');
         $_post = &$post;
@@ -172 +173 @@
         if ( ! $_post = wp_cache_get($post, 'posts') ) {
             $_post = & $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->posts WHERE ID = %d LIMIT 1", $post));
+            _get_post_ancestors($_post);
             wp_cache_add($_post->ID, $_post, 'posts');
         }
     }
-
-    // Populate the ancestors field.
-    // Not cached since we don't clear cache for ancestors when a post changes.
-    _get_post_ancestors($_post);
 
     $_post = sanitize_post($_post, $filter);
@@ -2728 +2726 @@
  */
 function clean_page_cache($id) {
+    global $wpdb;
+    $id = (int) $id;
+
     clean_post_cache($id);
 
@@ -2734 +2735 @@
 
     do_action('clean_page_cache', $id);
+
+    if ( $children = $wpdb->get_col( $wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_parent = %d", $id) ) )
+        foreach( $children as $cid )
+            clean_page_cache( $cid );
 }
 
@@ -2957 +2962 @@
 
 function _get_post_ancestors(&$_post) {
-    global $wpdb;
-
-    if ( !empty($_post->ancestors) )
-        return;
-
-    $_post->ancestors = array();
-
-    if ( empty($_post->post_parent) || $_post->ID == $_post->post_parent )
-        return;
-
-    $id = $_post->ancestors[] = $_post->post_parent;
-    while ( $ancestor = $wpdb->get_var("SELECT `post_parent` FROM $wpdb->posts WHERE ID= '{$id}' LIMIT 1") ) {
-        if ( $id == $ancestor )
-            break;
-        $id = $_post->ancestors[] = $ancestor;
-    }
+    global $wpdb;
+
+    if ( isset($_post->ancestors) )
+        return;
+
+    $_post->ancestors = array();
+
+    if ( empty($_post->post_parent) || $_post->ID == $_post->post_parent )
+        return;
+
+    $id = $_post->ancestors[] = $_post->post_parent;
+    while ( $ancestor = $wpdb->get_var( $wpdb->prepare("SELECT `post_parent` FROM $wpdb->posts WHERE ID = %d LIMIT 1", $id) ) ) {
+        if ( $id == $ancestor )
+            break;
+        $id = $_post->ancestors[] = $ancestor;
+    }
 }