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

Timestamp:

07/30/2009 01:39:34 PM (15 years ago)

Author:

azaozz

Message:

Trash status updates for posts, pages, comments and attachments, props caesarsgrunt, see #4529

File:

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

trunk/wp-includes/post.php

@@ -999 +999 @@
     $count = $wpdb->get_results( $wpdb->prepare( $query, $type ), ARRAY_A );
 
-    $stats = array( 'publish' => 0, 'private' => 0, 'draft' => 0, 'pending' => 0, 'future' => 0 );
+    $stats = array( 'publish' => 0, 'private' => 0, 'draft' => 0, 'pending' => 0, 'future' => 0, 'trash' => 0 );
     foreach( (array) $count as $row_num => $row ) {
         $stats[$row['post_status']] = $row['num_posts'];
@@ -1028 +1028 @@
 
     $and = wp_post_mime_type_where( $mime_type );
-    $count = $wpdb->get_results( "SELECT post_mime_type, COUNT( * ) AS num_posts FROM $wpdb->posts WHERE post_type = 'attachment' $and GROUP BY post_mime_type", ARRAY_A );
+    $count = $wpdb->get_results( "SELECT post_mime_type, COUNT( * ) AS num_posts FROM $wpdb->posts WHERE post_type = 'attachment' AND post_status != 'trash' $and GROUP BY post_mime_type", ARRAY_A );
 
     $stats = array( );
@@ -1034 +1034 @@
         $stats[$row['post_mime_type']] = $row['num_posts'];
     }
+    $stats['trash'] = $wpdb->get_var( "SELECT COUNT( * ) FROM $wpdb->posts WHERE post_type = 'attachment' AND post_status = 'trash' $and");
 
     return (object) $stats;
@@ -1141 +1142 @@
         return $post;
 
-    if ( 'attachment' == $post->post_type )
+    if ( ($post->post_type == 'post' || $post->post_type == 'page') && get_post_status($postid) != 'trash' && EMPTY_TRASH_DAYS > 0 )
+        return wp_trash_post($postid);
+        
+    if ( $post->post_type == 'attachment' )
         return wp_delete_attachment($postid);
 
     do_action('delete_post', $postid);
+    
+    $trash_meta = get_option('wp_trash_meta');
+    if ( is_array($trash_meta) && isset($trash_meta['posts'][$postid]) ) {
+        unset($trash_meta['posts'][$postid]);
+        update_option('wp_trash_meta', $trash_meta);
+    }
 
     /** @todo delete for pluggable post taxonomies too */
@@ -1201 +1211 @@
 
     do_action('deleted_post', $postid);
+
+    return $post;
+}
+
+/**
+ * Moves a post or page to the Trash
+ *
+ * @since 2.9.0
+ * @uses do_action() on 'trash_post' before trashing
+ * @uses do_action() on 'trashed_post' after trashing
+ *
+ * @param int $postid Post ID.
+ * @return mixed False on failure
+ */
+function wp_trash_post($postid = 0) {
+    if ( EMPTY_TRASH_DAYS == 0 )
+        return wp_delete_post($postid);
+
+    if ( !$post = wp_get_single_post($postid, ARRAY_A) )
+        return $post;
+
+    do_action('trash_post', $postid);
+
+    $trash_meta = get_option('wp_trash_meta');
+    if ( !is_array($trash_meta) )
+        $trash_meta = array();
+    $trash_meta['posts'][$postid]['status'] = $post['post_status'];
+    $trash_meta['posts'][$postid]['time'] = time();
+    update_option('wp_trash_meta', $trash_meta);
+
+    $post['post_status'] = 'trash';
+    wp_insert_post($post);
+
+    do_action('trashed_post', $postid);
+
+    return $post;
+}
+
+/**
+ * Removes a post or page from the Trash
+ *
+ * @since 2.9.0
+ * @uses do_action() on 'untrash_post' before undeletion
+ * @uses do_action() on 'untrashed_post' after undeletion
+ *
+ * @param int $postid Post ID.
+ * @return mixed False on failure
+ */
+function wp_untrash_post($postid = 0) {
+    if (!$post = wp_get_single_post($postid, ARRAY_A))
+        return $post;
+
+    do_action('untrash_post', $postid);
+    
+    $post['post_status'] = 'draft';
+    
+    $trash_meta = get_option('wp_trash_meta');
+    if (is_array($trash_meta) && isset($trash_meta['posts'][$postid])) {
+        $post['post_status'] = $trash_meta['posts'][$postid]['status'];
+        unset($trash_meta['posts'][$postid]);
+        update_option('wp_trash_meta', $trash_meta);
+    }
+    
+    wp_insert_post($post);
+    
+    do_action('untrashed_post', $postid);
 
     return $post;
@@ -2587 +2663 @@
     if ( 'attachment' != $post->post_type )
         return false;
+    
+    if ( 'trash' != $post->post_status )
+        return wp_trash_post($postid);
+
+    $trash_meta = get_option('wp_trash_meta');
+    if ( is_array($trash_meta) && isset($trash_meta['posts'][$postid]) ) {
+        unset($trash_meta['posts'][$postid]);
+        update_option('wp_trash_meta', $trash_meta);
+    }
 
     $meta = wp_get_attachment_metadata( $postid );