Changeset 5534 for trunk/wp-admin/admin-db.php

Timestamp:

05/23/2007 10:11:02 PM (19 years ago)

Author:

ryan

Message:

No more TAXONOMY bit fiels. see #4189

File:

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

trunk/wp-admin/admin-db.php

@@ -163 +163 @@
         if ( $id = category_exists($cat_name) )
                 return $id;
-        $cat_array = array('cat_name' => $cat_name, 'type' => TAXONOMY_CATEGORY);
-
-        if ( $id = category_object_exists($cat_name) ) {
-                $category = get_category($id);
-                $cat_array['type'] = $category->type | $cat_array['type'];
-                $cat_array['cat_ID'] = $id;
-                return wp_update_category($cat_array);
-        } else {
-                return wp_insert_category($cat_array);
-        }
+
+        return wp_insert_category( array('cat_name' => $cat_name) );
 }
 
@@ -191 +183 @@
 }
 
-function category_object_exists($cat_name) {
-        global $wpdb;
-        if (!$category_nicename = sanitize_title($cat_name))
-                return 0;
-
-        return (int) $wpdb->get_var("SELECT cat_ID FROM $wpdb->categories WHERE category_nicename = '$category_nicename'");
-}
-
 function category_exists($cat_name) {
-        global $wpdb;
-        if (!$category_nicename = sanitize_title($cat_name))
-                return 0;
-
-        return (int) $wpdb->get_var("SELECT cat_ID FROM $wpdb->categories WHERE category_nicename = '$category_nicename' AND ( type & " . TAXONOMY_CATEGORY .  " != 0 )");
+        return is_term($cat_name, 'category');
 }
 
@@ -215 +195 @@
                 return $id;
 
-        $tag_id = wp_insert_term($tag_name, 'post_tag');        
+        return wp_insert_term($tag_name, 'post_tag');   
 }