Changeset 10129

Timestamp:

12/08/2008 07:29:42 PM (16 years ago)

Author:

ryan

Message:

Check for circular post parent dependencies. Exclude the current post and its children from the parent dropdown.

Location:

trunk

Files:

• wp-admin/edit-page-form.php (modified) (1 diff)
• wp-includes/post.php (modified) (3 diffs)

trunk/wp-admin/edit-page-form.php

@@ -271 +271 @@
 <h5><?php _e('Parent') ?></h5>
 <label class="hidden" for="parent_id"><?php _e('Page Parent') ?></label>
-<?php wp_dropdown_pages(array('selected' => $post->post_parent, 'name' => 'parent_id', 'show_option_none' => __('Main Page (no parent)'))); ?>
+<?php wp_dropdown_pages(array('exclude_tree' => $post->ID, 'selected' => $post->post_parent, 'name' => 'parent_id', 'show_option_none' => __('Main Page (no parent)'))); ?>
 <p><?php _e('You can arrange your pages in hierarchies, for example you could have an &#8220;About&#8221; page that has &#8220;Life Story&#8221; and &#8220;My Dog&#8221; pages under it. There are no limits to how deeply nested you can make pages.'); ?></p>
 <?php

trunk/wp-includes/post.php

@@ -1418 +1418 @@
         $post_parent = 0;
 
+    if ( !empty($post_ID) ) {
+        if ( $post_parent == $post_ID ) {
+            // Post can't be its own parent
+            $post_parent = 0;
+        } elseif ( !empty($post_parent) ) {
+            $parent_post = get_post($post_parent);
+            // Check for circular dependency
+            if ( $parent_post->post_parent == $post_ID )
+                $post_parent = 0;
+        }
+    }
+
     if ( isset($menu_order) )
         $menu_order = (int) $menu_order;
@@ -2060 +2072 @@
         'exclude' => '', 'include' => '',
         'meta_key' => '', 'meta_value' => '',
-        'authors' => '', 'parent' => -1
+        'authors' => '', 'parent' => -1, 'exclude_tree' => ''
     );
 
@@ -2170 +2182 @@
     if ( $child_of || $hierarchical )
         $pages = & get_page_children($child_of, $pages);
+
+    if ( !empty($exclude_tree) ) {
+        $exclude = array();
+        
+        $exclude = (int) $exclude_tree;
+        $children = get_page_children($exclude, $pages);
+        $excludes = array();
+        foreach ( $children as $child )
+            $excludes[] = $child->ID;
+        $excludes[] = $exclude;
+        $total = count($pages);
+        for ( $i = 0; $i < $total; $i++ ) {
+            if ( in_array($pages[$i]->ID, $excludes) )
+                unset($pages[$i]);
+        }
+    }
 
     $cache[ $key ] = $pages;