Changeset 5184

Timestamp:

04/05/07 21:16:02 (1 year ago)

Author:

ryan

Message:

Bit twiddling. Add type bitfield to categories table. see #3723

Files:

• trunk/wp-admin/admin-db.php (modified) (3 diffs)
• trunk/wp-admin/admin-functions.php (modified) (2 diffs)
• trunk/wp-admin/upgrade-schema.php (modified) (1 diff)
• trunk/wp-includes/category.php (modified) (2 diffs)
• trunk/wp-includes/post.php (modified) (4 diffs)
• trunk/wp-includes/version.php (modified) (1 diff)

trunk/wp-admin/admin-db.php

@@ -122 +122 @@
-        $links_private = 0;
-
+    if ( empty($type) )
+        $type = TAXONOMY_CATEGORY;
+
-    // Let's check if we have this category already, if so just do an update
-
+ {
-        $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) {
-) VALUES ('0', '$cat_name', '$category_nicename', '$category_description', '$category_parent', '$links_private', '$posts_privat
+, type) VALUES ('0', '$cat_name', '$category_nicename', '$category_description', '$category_parent', '$links_private', '$posts_private', '$typ
-        $cat_ID = (int) $wpdb->insert_id;
-    } else {
-
+, type = '$type'
-    }
-
@@ -196 +204 @@
-    $parent = $category->category_parent;
-
-
-
-
-
+
+
+
+
+
+
+
-    // Update children to point to new parent
-    $wpdb->query("UPDATE $wpdb->categories SET category_parent = '$parent' WHERE category_parent = '$cat_ID'");
-
-    // Only set posts and links to the default category if they're not in another category already
-
+ AND rel_type = 'category'
-    foreach ( (array) $posts as $post_id ) {
-        $cats = wp_get_post_categories($post_id);
@@ -256 +267 @@
-
-    return (int) $wpdb->get_var("SELECT cat_ID FROM $wpdb->categories WHERE category_nicename = '$category_nicename'");
+}
+
+function wp_create_tag($tag_name) {
+    $tag_array = array('cat_name' => $tag_name, 'type' => TAXONOMY_TAG);
+    return wp_insert_category($tag_array);
-}
-

trunk/wp-admin/admin-functions.php

@@ -648 +648 @@
-function return_categories_list( $parent = 0 ) {
-    global $wpdb;
-( link_count = 0 AND tag_count = 0 ) OR category_count != 0 OR ( link_count = 0 AND category_count = 0 AND tag_count = 0 )
+type & " . TAXONOMY_CATEGORY . " != 0 ) AND ( link_count = 0 OR category_count != 0
-}
-
@@ -745 +745 @@
-function return_link_categories_list( $parent = 0 ) {
-    global $wpdb;
-( category_count = 0 AND tag_count = 0 ) OR link_count != 0 OR ( link_count = 0 AND category_count = 0 AND tag_count = 0 )
+type & " . TAXONOMY_CATEGORY . " != 0 ) AND ( category_count = 0 OR link_count != 0
-}
-

trunk/wp-admin/upgrade-schema.php

@@ -22 +22 @@
-  posts_private tinyint(1) NOT NULL default '0',
-  links_private tinyint(1) NOT NULL default '0',
+  type tinyint NOT NULL default '1',
-  PRIMARY KEY  (cat_ID),
-  KEY category_nicename (category_nicename)

trunk/wp-includes/category.php

@@ -1 +1 @@
-<?php
+
+define('TAXONOMY_CATEGORY', 1);
+define('TAXONOMY_TAG', 2);
-
-function get_all_category_ids() {
@@ -79 +82 @@
-            $where .= ' AND category_count > 0';
-    } else {
-ag_count = 0 OR ( tag_count != 0 AND ( link_count > 0 OR category_count > 0 ) )
+ype & ' . TAXONOMY_CATEGORY . ' != 0
-    }
-

trunk/wp-includes/post.php

@@ -788 +788 @@
-            continue; // discard
-        if ( !$tag_id = category_exists( $tag ) )
-category
+tag
-        $tag_ids[] = $tag_id;
-    }
@@ -838 +838 @@
-    foreach ( $all_affected_tags as $tag_id ) {
-        $count = $wpdb->get_var( "SELECT COUNT(*) FROM $wpdb->post2cat, $wpdb->posts WHERE $wpdb->posts.ID=$wpdb->post2cat.post_id AND post_status = 'publish' AND post_type = 'post' AND category_id = '$tag_id' AND rel_type = 'tag'" );
-
+, type = type | " . TAXONOMY_TAG . "
-        if ( $count == 0 )
-ag_count = '-1'
+ype = type & ~". TAXONOMY_TAG . "
-        clean_category_cache( $tag_id );
-        do_action( 'edit_category', $tag_id );
@@ -877 +877 @@
-                DELETE FROM $wpdb->post2cat
-                WHERE category_id = '$del'
-
+ AND rel_type = 'category'
-                ");
-        }
@@ -899 +899 @@
-    foreach ( $all_affected_cats as $cat_id ) {
-        $count = $wpdb->get_var("SELECT COUNT(*) FROM $wpdb->post2cat, $wpdb->posts WHERE $wpdb->posts.ID=$wpdb->post2cat.post_id AND post_status = 'publish' AND post_type = 'post' AND category_id = '$cat_id' AND rel_type = 'category'");
-
+, type = type | " . TAXONOMY_CATEGORY . "
-        clean_category_cache($cat_id);
-        do_action('edit_category', $cat_id);

trunk/wp-includes/version.php

@@ -4 +4 @@
-
-$wp_version = '2.2-bleeding';
-4865
+5183
-
-?>