Changeset 5271

Timestamp:

04/15/2007 02:26:26 AM (18 years ago)

Author:

ryan

Message:

tag_exists(), category_object_exists(), and some tag and cat create fix ups. see #3723

Location:

trunk

Files:

• wp-admin/admin-db.php (modified) (5 diffs)
• wp-includes/post.php (modified) (1 diff)

trunk/wp-admin/admin-db.php

@@ -95 +95 @@
     else
         $update = false;
-
+error_log("Type for $cat_ID is $type", 0);
     $cat_name = apply_filters('pre_category_name', $cat_name);
 
@@ -126 +126 @@
 
     // Let's check if we have this category already, if so just do an update
-    if ( $cat_ID = category_exists( $category_nicename ) ) {
+    if ( !$update && $cat_ID = category_object_exists( $category_nicename ) )
         $update = true;
-        $category = get_category($cat_ID);
-        // If inserting a category that already exists, OR in the new type rather
-        // than replacing the entire value.
-        $type = $category->type | $type;
-    }
 
     if (!$update) {
@@ -241 +236 @@
 
 function wp_create_category($cat_name) {
-    $cat_array = compact('cat_name');
-    return wp_insert_category($cat_array);
+    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);
+    }
 }
 
@@ -261 +266 @@
 }
 
+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;
@@ -266 +279 @@
         return 0;
 
-    return (int) $wpdb->get_var("SELECT cat_ID FROM $wpdb->categories WHERE category_nicename = '$category_nicename'");
+    return (int) $wpdb->get_var("SELECT cat_ID FROM $wpdb->categories WHERE category_nicename = '$category_nicename' AND ( type & " . TAXONOMY_CATEGORY .  " != 0 )");
+}
+
+function tag_exists($tag_name) {
+    global $wpdb;
+    if (! $tag_nicename = sanitize_title($tag_name))
+        return 0;
+
+    return (int) $wpdb->get_var("SELECT cat_ID FROM $wpdb->categories WHERE category_nicename = '$tag_nicename' AND ( type & " . TAXONOMY_TAG .  " != 0 )");
 }
 
 function wp_create_tag($tag_name) {
+    if ( $id = tag_exists($tag_name) )
+        return $id;
     $tag_array = array('cat_name' => $tag_name, 'type' => TAXONOMY_TAG);
-    return wp_insert_category($tag_array);
+
+    if ( $id = category_object_exists($tag_name) ) {
+        error_log("$tag_name exists", 0);
+        $category = get_category($id);
+        $tag_array['type'] = $category->type | $tag_array['type'];
+        $tag_array['cat_ID'] = $id;
+        error_log("Type: {$tag_array['type']}", 0);
+        $id = wp_update_category($tag_array);
+        error_log("Tag id $id", 0);
+        return $id;
+    } else {
+        return wp_insert_category($tag_array);
+    }
 }
 

trunk/wp-includes/post.php

@@ -809 +809 @@
         if ( !$tag_slug = sanitize_title( $tag ) )
             continue; // discard
-        if ( !$tag_id = category_exists( $tag ) )
+        if ( !$tag_id = tag_exists( $tag ) )
             $tag_id = wp_create_tag( $tag );
         $tag_ids[] = $tag_id;