Ticket #3723: tags.diff

wp-includes/category.php

@@ -23 +23 @@
-                'hide_empty' => true, 'include_last_update_time' => false, 'hierarchical' => 1, 'exclude' => '', 'include' => '',
-                'number' => '', 'pad_counts' => false);
-        $r = array_merge($defaults, $r);
-
-
-
+
+
+
+
+
+
+
+
-                $r['orderby'] = "cat_" . $r['orderby'];  // restricts order by to cat_ID and cat_name fields
-        $r['number'] = (int) $r['number'];
+        if ( 'tag' == $type )
+                $r['hierarchical'] = 0;
-        extract($r);
-
-        $key = md5( serialize( $r ) );
@@ -75 +82 @@
-        if ( $hide_empty && !$hierarchical ) {
-                if ( 'link' == $type )
-                        $where .= ' AND link_count > 0';
+                else if ( 'post' == $type )
+                        $where .= ' AND category_count > 0';
-                else
-category
+tagged
-        }
-
-        if ( !empty($number) )
@@ -276 +285 @@
-                $results = $wpdb->get_results("SELECT post_id, category_id FROM $wpdb->post2cat LEFT JOIN $wpdb->posts ON post_id = ID WHERE category_id IN (".join(',', $cat_IDs).") AND post_type = 'post' AND post_status = 'publish'");
-                foreach ( $results as $row )
-                        ++$cat_items[$row->category_id][$row->post_id];
-
+if ( $type == 'link' ) 
-                $results = $wpdb->get_results("SELECT $wpdb->link2cat.link_id, category_id FROM $wpdb->link2cat LEFT JOIN $wpdb->links USING (link_id) WHERE category_id IN (".join(',', $cat_IDs).") AND link_visible = 'Y'");
-                foreach ( $results as $row )
-                        ++$cat_items[$row->category_id][$row->link_id];
+        } else {
+                $results = $wpdb->get_results("SELECT post_id, category_id FROM $wpdb->post2tag LEFT JOIN $wpdb->posts ON post_id = ID WHERE category_id IN (".join(',', $cat_IDs).") AND post_type = 'post' AND post_status = 'publish'");
+                foreach ( $results as $row )
+                        ++$cat_items[$row->category_id][$row->post_id];
-        }
-
-        // Touch every ancestor's lookup row for each post in each category
@@ -293 +306 @@
-                }
-        }
-
-
+  // TAGFIX
-        foreach ( (array) $cat_items as $id => $items )
-                if ( isset($cats[$id]) )
-                        $cats[$id]->{'link' == $type ? 'link_count' : 'category_count'} = count($items);

wp-includes/post.php

@@ -453 +453 @@
-        return array_unique($cat_ids);
-}
-
+function wp_get_post_tags($post_id = 0) {
+        $cats = &get_the_tags($post_id);
+        $cat_ids = array();
+        foreach ( $cats as $cat )
+                $cat_ids[] = (int) $cat->cat_ID;
+        return array_unique($cat_ids);
+}
+
-function wp_get_recent_posts($num = 10) {
-        global $wpdb;
-
@@ -761 +769 @@
-        return wp_update_post(array('post_status' => 'publish', 'ID' => $post_id, 'no_filter' => true));
-}
-
-wp_set_post_categories(
+_set_post_categories($type = 'cat', 
-        global $wpdb;
-        // If $post_categories isn't already an array, make it one:
-        if (!is_array($post_categories) || 0 == count($post_categories) || empty($post_categories))
-                $post_categories = array(get_option('default_category'));
-
-        $post_categories = array_unique($post_categories);
-
+        if ( 'cat' == $type ) {
+                $table = 'post2cat';
+                $counter = 'category_count';
+        } else {
+                $table = 'post2tag';
+                $counter = 'tagged_count';
+        }
+
-        // First the old categories
-        $old_categories = $wpdb->get_col("
-                SELECT category_id
-post2cat
+$table
-                WHERE post_id = $post_ID");
-
-        if (!$old_categories) {
@@ -787 +800 @@
-        if ($delete_cats) {
-                foreach ($delete_cats as $del) {
-                        $wpdb->query("
-post2cat
+$table
-                                WHERE category_id = $del
-                                        AND post_id = $post_ID
-                                ");
@@ -801 +814 @@
-                foreach ($add_cats as $new_cat) {
-                        if ( !empty($new_cat) )
-                                $wpdb->query("
-post2cat
+$table
-                                        VALUES ($post_ID, $new_cat)");
-                }
-        }
@@ -809 +822 @@
-        // Update category counts.
-        $all_affected_cats = array_unique(array_merge($post_categories, $old_categories));
-        foreach ( $all_affected_cats as $cat_id ) {
-post2cat, $wpdb->posts WHERE $wpdb->posts.ID=$wpdb->post2cat
-category_count
+$table, $wpdb->posts WHERE $wpdb->posts.ID=$wpdb->$table
+$counter
-                clean_category_cache($cat_id);
-                do_action('edit_category', $cat_id);
-        }
-      // wp_set_post_categories()
+
-
+function wp_set_post_categories($post_ID = 0, $post_categories = array()) {
+        // If $post_categories isn't already an array, make it one:
+        if (!is_array($post_categories) || 0 == count($post_categories) || empty($post_categories))
+                $post_categories = array(get_option('default_category'));
+
+        return _set_post_categories($post_ID, $post_categories);
+}
+
+function wp_set_post_tags($post_ID = 0, $post_tags = array()) {
+        global $wpdb;
+        // If $post_categories isn't already an array, make it one:
+        if (!is_array($post_tags) || 0 == count($post_tags) || empty($post_tags))
+                $post_tags = array();
+
+        return _set_post_categories($post_ID, $post_tags);
+}
+
-//
-// Trackback and ping functions
-//

wp-admin/admin-functions.php

@@ -635 +635 @@
-
-function return_categories_list( $parent = 0 ) {
-        global $wpdb;
-( link_count = 0 AND category
+tagged_count = 0 OR ( link_count = 0 AND category_count = 0 AND tagged
-}
-
-function sort_cats( $cat1, $cat2 ) {
@@ -709 +709 @@
-
-function return_link_categories_list( $parent = 0 ) {
-        global $wpdb;
-( link_count = 0 AND category
+tagged_count = 0 OR ( link_count = 0 AND category_count = 0 AND tagged
-}
-
-function get_nested_link_categories( $default = 0, $parent = 0 ) {

wp-admin/admin-db.php

@@ -248 +248 @@
-        return $wpdb->get_var("SELECT cat_ID FROM $wpdb->categories WHERE category_nicename = '$category_nicename'");
-}
-
+function wp_create_tag($tag_name) {
+        return wp_create_tag($tag_name);
+}
+
+function wp_create_tags($tags, $post_id = '') {
+        $cat_ids = array ();
+        foreach ($tags as $tag) {
+                if ($id = tag_exists($tag))
+                        $tag_ids[] = $id;
+                else
+                        if ($id = wp_create_tag($tag))
+                                $tag_ids[] = $id;
+        }
+
+        if ($post_id)
+                wp_set_post_tags($post_id, $tag_ids);
+
+        return $tag_ids;
+}
+
+function tag_exists($tag_name) {
+        return category_exists($tag_name);
+}
+
-function wp_delete_user($id, $reassign = 'novalue') {
-        global $wpdb;
-

wp-admin/upgrade-schema.php

@@ -18 +18 @@
-  category_parent bigint(20) NOT NULL default '0',
-  category_count bigint(20) NOT NULL default '0',
-  link_count bigint(20) NOT NULL default '0',
+  tagged_count bigint(20) NOT NULL default '0',
-  posts_private tinyint(1) NOT NULL default '0',
-  links_private tinyint(1) NOT NULL default '0',
-  PRIMARY KEY  (cat_ID),
@@ -91 +92 @@
-  PRIMARY KEY  (rel_id),
-  KEY post_id (post_id,category_id)
-) $charset_collate;
+CREATE TABLE $wpdb->post2tag (
+  rel_id bigint(20) NOT NULL auto_increment,
+  post_id bigint(20) NOT NULL default '0',
+  tag_id bigint(20) NOT NULL default '0',
+  PRIMARY KEY  (rel_id),
+  KEY post_id (post_id,tag_id)
+) $charset_collate;
-CREATE TABLE $wpdb->postmeta (
-  meta_id bigint(20) NOT NULL auto_increment,
-  post_id bigint(20) NOT NULL default '0',