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

Timestamp:

11/09/2009 08:12:07 PM (16 years ago)

Author:

ryan

Message:

Add force delete option.

File:

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

trunk/wp-includes/post.php

@@ -1150 +1150 @@
  *
  * @param int $postid Post ID.
+ * @param bool $force_delete Whether to bypass trash and force deletion
  * @return mixed False on failure
  */
-function wp_delete_post($postid = 0) {
+function wp_delete_post( $postid = 0, $force_delete = false ) {
     global $wpdb, $wp_rewrite;
 
@@ -1158 +1159 @@
         return $post;
 
-    if ( ($post->post_type == 'post' || $post->post_type == 'page') && get_post_status($postid) != 'trash' && EMPTY_TRASH_DAYS > 0 )
-        return wp_trash_post($postid);
+    if ( !$force_delete && ( $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);
+        return wp_delete_attachment( $postid, $force_delete );
 
     do_action('delete_post', $postid);
@@ -2800 +2801 @@
  *
  * @param int $postid Attachment ID.
+ * @param bool $force_delete Whether to bypass trash and force deletion
  * @return mixed False on failure. Post data on success.
  */
-function wp_delete_attachment($post_id) {
+function wp_delete_attachment( $post_id, $force_delete = false ) {
     global $wpdb;
 
@@ -2811 +2813 @@
         return false;
 
-    if ( 'trash' != $post->post_status )
-        return wp_trash_post($post_id);
+    if ( !$force_delete && 'trash' != $post->post_status )
+        return wp_trash_post( $post_id );
 
     delete_post_meta($post_id, '_wp_trash_meta_status');