Ticket #9882: 9882.2.patch

wp-admin/includes/taxonomy.php

@@ -136 +136 @@
         if ( $parent < 0 )
                 $parent = 0;
 
-        if ( empty($parent) || !category_exists( $parent ) || ($cat_ID && cat_is_ancestor_of($cat_ID, $parent) ) )
+        if ( empty($parent) || !category_exists( $parent ) || ($cat_ID && is_cat_ancestor_of($cat_ID, $parent) ) )
                 $parent = 0;
 
         $args = compact('name', 'slug', 'parent', 'description');

wp-includes/category.php

@@ -200 +200 @@
  * You can use either an id or the category object for both parameters. If you
  * use an integer the category will be retrieved.
  *
- * @since 2.1.0
+ * @since 3.0
  *
  * @param int|object $cat1 ID or object to check if this is the parent category.
  * @param int|object $cat2 The child category.
  * @return bool Whether $cat2 is child of $cat1
  */
-function cat_is_ancestor_of( $cat1, $cat2 ) {
+function is_cat_ancestor_of( $cat1, $cat2 ) {
         if ( ! isset($cat1->term_id) )
                 $cat1 = &get_category( $cat1 );
         if ( ! isset($cat2->parent) )
@@ -217 +217 @@
         if ( $cat2->parent == $cat1->term_id )
                 return true;
 
-        return cat_is_ancestor_of( $cat1, get_category( $cat2->parent ) );
+        return is_cat_ancestor_of( $cat1, get_category( $cat2->parent ) );
 }
 
 

wp-includes/deprecated.php

@@ -2513 +2513 @@
         _deprecated_function( __FUNCTION__, '3.0' );
         return '';
 }
+
+/**
+ * Check if a category is an ancestor of another category.
+ *
+ * @since 2.1.0
+ * @deprecated 3.0
+ * @deprecated Use is_cat_ancestor_of()
+ * @see is_cat_ancestor_of()
+ *
+ * @param int|object $cat1 ID or object to check if this is the parent category.
+ * @param int|object $cat2 The child category.
+ * @return bool Whether $cat2 is child of $cat1
+ */
+function cat_is_ancestor_of( $cat1, $cat2 ) {
+        _deprecated_function( __FUNCTION__, '3.0', 'is_cat_ancestor_of()' );
+
+        return is_cat_ancestor_of( $cat1, $cat2 );
+}
+