Changeset 15758

Timestamp:

10/08/2010 04:22:14 PM (13 years ago)

Author:

ryan

Message:

Some more hierarchy loop detection.

File:

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

trunk/wp-includes/post.php

@@ -4020 +4020 @@
 
     if ( $children = $wpdb->get_col( $wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_parent = %d", $id) ) ) {
-        foreach( $children as $cid )
+        foreach ( $children as $cid ) {
+            // Loop detection
+            if ( $cid == $id )
+                continue;
             clean_post_cache( $cid );
+        }
     }
 
@@ -4326 +4330 @@
     $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 )
+        // Loop detection: If the ancestor has been seen before, break.
+        if ( ( $ancestor == $_post->ID ) || in_array($ancestor,  $_post->ancestors) )
             break;
         $id = $_post->ancestors[] = $ancestor;