Ticket #3387: patch.txt

Index: wp-admin/admin-db.php
===================================================================
--- wp-admin/admin-db.php       (revision 4523)
+++ wp-admin/admin-db.php       (working copy)
@@ -108,7 +108,7 @@
        $category_description = apply_filters('pre_category_description', $category_description);
 
        $category_parent = (int) $category_parent;
-       if ( empty($category_parent) || !get_category( $category_parent ) || $category_parent == $cat_ID )
+       if ( empty($category_parent) || !get_category( $category_parent ) || ($cat_ID && _cat_is_ancestor_of($cat_ID, $category_parent) ) )
                $category_parent = 0;
 
        if ( isset($posts_private) )
Index: wp-includes/category.php
===================================================================
--- wp-includes/category.php    (revision 4523)
+++ wp-includes/category.php    (working copy)
@@ -225,6 +225,21 @@
        return $category->cat_name;
 }
 
+function cat_is_ancestor_of($cat1, $cat2) { 
+       if ( is_int($cat1) ) 
+               $cat1 = & get_category($cat1); 
+       if ( is_int($cat2) ) 
+               $cat2 = & get_category($cat2); 
+
+       if ( !$cat1->cat_ID || !$cat2->category_parent ) 
+               return false; 
+
+       if ( $cat2->category_parent == $cat1->cat_ID ) 
+               return true; 
+
+       return cat_is_ancestor_of($cat1, get_category($cat2->parent_category)); 
+} 
+
 //
 // Private
 //