Changeset 5556 for trunk/wp-includes/post.php

Timestamp:

05/27/2007 05:15:18 AM (16 years ago)

Author:

ryan

Message:

Fix object term relationship deletion and count updating.

File:

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

trunk/wp-includes/post.php

@@ -411 +411 @@
     do_action('delete_post', $postid);
 
-    if ( 'publish' == $post->post_status && 'post' == $post->post_type ) {
-        $categories = wp_get_post_categories($post->ID);
-        if ( is_array( $categories ) ) {
-            foreach ( $categories as $cat_id ) {
-                $wpdb->query("UPDATE $wpdb->categories SET category_count = category_count - 1 WHERE cat_ID = '$cat_id'");
-                wp_cache_delete($cat_id, 'category');
-                do_action('edit_category', $cat_id);
-            }
-        }
-    }
+    // TODO delete for pluggable post taxonomies too
+    wp_delete_object_term_relationships($postid, array('category', 'post_tag'));
 
     if ( 'page' == $post->post_type )
@@ -430 +422 @@
 
     $wpdb->query("DELETE FROM $wpdb->comments WHERE comment_post_ID = $postid");
-
-    $wpdb->query("DELETE FROM $wpdb->post2cat WHERE post_id = $postid");
 
     $wpdb->query("DELETE FROM $wpdb->postmeta WHERE post_id = $postid");
@@ -445 +435 @@
 }
 
-function wp_get_post_categories($post_id = 0) {
+function wp_get_post_categories( $post_id = 0, $args = array() ) {
     $post_id = (int) $post_id;
 
-    $cats = get_object_terms($post_id, 'category', 'get=fields');
+    $defaults = array('fields' => 'ids');
+    $args = wp_parse_args( $args, $defaults );
+
+    $cats = get_object_terms($post_id, 'category', $args);
     return $cats;
 }
 
-function wp_get_post_tags( $post_id = 0 ) {
-    global $tag_cache, $blog_id;
-
+function wp_get_post_tags( $post_id = 0, $args = array() ) {
     $post_id = (int) $post_id;
+
+    $defaults = array('fields' => 'all');
+    $args = wp_parse_args( $args, $defaults );
     
-    $tags = get_object_terms($post_id, 'post_tag');
+    $tags = get_object_terms($post_id, 'post_tag', $args);
+
     return $tags;
 }