Changeset 19678

Timestamp:

01/04/2012 10:44:19 PM (13 years ago)

Author:

ryan

Message:

Introduce term_is_ancestor_of(). Finish taxonomy support for wp_insert_category(). Props garyc40. fixes #15581

Location:

trunk

Files:

• wp-admin/includes/taxonomy.php (modified) (1 diff)
• wp-includes/category.php (modified) (7 diffs)
• wp-includes/taxonomy.php (modified) (1 diff)

trunk/wp-admin/includes/taxonomy.php

@@ -118 +118 @@
         $parent = 0;
 
-    if ( empty($parent) || !category_exists( $parent ) || ($cat_ID && cat_is_ancestor_of($cat_ID, $parent) ) )
+    if ( empty( $parent ) || ! term_exists( $parent, $taxonomy ) || ( $cat_ID && term_is_ancestor_of( $cat_ID, $parent, $taxonomy ) ) )
         $parent = 0;
 

trunk/wp-includes/category.php

@@ -208 +208 @@
  */
 function cat_is_ancestor_of( $cat1, $cat2 ) {
-    if ( ! isset($cat1->term_id) )
-        $cat1 = &get_category( $cat1 );
-    if ( ! isset($cat2->parent) )
-        $cat2 = &get_category( $cat2 );
-
-    if ( empty($cat1->term_id) || empty($cat2->parent) )
-        return false;
-    if ( $cat2->parent == $cat1->term_id )
-        return true;
-
-    return cat_is_ancestor_of( $cat1, get_category( $cat2->parent ) );
-}
-
+    return term_is_ancestor_of( $cat1, $cat2, 'category' );
+}
 
 /**
@@ -235 +224 @@
     return sanitize_term( $category, 'category', $context );
 }
-
 
 /**
@@ -255 +243 @@
 /* Tags */
 
-
 /**
  * Retrieves all post tags.
@@ -277 +264 @@
     return $tags;
 }
-
 
 /**
@@ -302 +288 @@
 }
 
-
 /* Cache */
-
 
 /**
@@ -317 +301 @@
     clean_term_cache( $id, 'category' );
 }
-
 
 /**
@@ -356 +339 @@
 }
 
-
 ?>

trunk/wp-includes/taxonomy.php

@@ -1496 +1496 @@
 
 /**
+ * Check if a term is an ancestor of another term.
+ *
+ * You can use either an id or the term object for both parameters.
+ *
+ * @since 3.4.0
+ *
+ * @param int|object $term1 ID or object to check if this is the parent term.
+ * @param int|object $term2 The child term.
+ * @param string $taxonomy Taxonomy name that $term1 and $term2 belong to.
+ * @return bool Whether $term2 is child of $term1
+ */
+function term_is_ancestor_of( $term1, $term2, $taxonomy ) {
+    if ( ! isset( $term1->term_id ) )
+        $term1 = get_term( $term1, $taxonomy );
+    if ( ! isset( $term2->parent ) )
+        $term2 = get_term( $term2, $taxonomy );
+
+    if ( empty( $term1->term_id ) || empty( $term2->parent ) )
+        return false;
+    if ( $term2->parent == $term1->term_id )
+        return true;
+
+    return term_is_ancestor_of( $term1, get_term( $term2->parent, $taxonomy ), $taxonomy );
+}
+
+/**
  * Sanitize Term all fields.
  *