Changeset 6157 for trunk/wp-admin/includes/taxonomy.php

Timestamp:

09/22/2007 06:01:08 PM (18 years ago)

Author:

ryan

Message:

Term with slug that conflicts with existing term with different parent gets a new term entry with a unique slug. see #5034

File:

• trunk/wp-admin/includes/taxonomy.php (modified) (3 diffs)

trunk/wp-admin/includes/taxonomy.php

@@ -74 +74 @@
     $parent = $category_parent;
 
-    $name = apply_filters('pre_category_name', $name);
-
-    if ( empty ($slug) )
-        $slug = sanitize_title($name);
-    else
-        $slug = sanitize_title($slug);
-    $slug = apply_filters('pre_category_nicename', $slug);
-
-    if ( empty ($description) )
-        $description = '';
-    $description = apply_filters('pre_category_description', $description);
-
     $parent = (int) $parent;
     if ( empty($parent) || !category_exists( $parent ) || ($cat_ID && cat_is_ancestor_of($cat_ID, $parent) ) )
@@ -97 +85 @@
         $cat_ID = wp_insert_term($cat_name, 'category', $args);
 
+    if ( is_wp_error($cat_ID) )
+        return 0;
+
     return $cat_ID['term_id'];
 }
@@ -105 +96 @@
     $cat_ID = (int) $catarr['cat_ID'];
 
-    if( $cat_ID == $catarr['category_parent'] )
+    if ( $cat_ID == $catarr['category_parent'] )
         return false;