Index: wp-admin/admin-ajax.php =================================================================== --- wp-admin/admin-ajax.php (revision 12431) +++ wp-admin/admin-ajax.php (working copy) @@ -228,7 +228,7 @@ die( (string) time() ); $r = wp_unspam_comment( $comment->comment_ID ); } elseif ( isset($_POST['delete']) && 1 == $_POST['delete'] ) { - $r = wp_delete_comment( $comment->comment_ID ); + $r = wp_delete_comment( $comment->comment_ID, true ); } else { die('-1'); } Index: wp-admin/comment.php =================================================================== --- wp-admin/comment.php (revision 12441) +++ wp-admin/comment.php (working copy) @@ -181,7 +181,7 @@ switch ( $action ) { case 'deletecomment' : - wp_delete_comment( $comment_id ); + wp_delete_comment( $comment_id, true ); $redir = add_query_arg( array('deleted' => '1'), $redir ); break; case 'trashcomment' : Index: wp-admin/edit-comments.php =================================================================== --- wp-admin/edit-comments.php (revision 12394) +++ wp-admin/edit-comments.php (working copy) @@ -69,7 +69,7 @@ $untrashed++; break; case 'delete' : - wp_delete_comment($comment_id); + wp_delete_comment($comment_id, true); $deleted++; break; } Index: wp-includes/comment.php =================================================================== --- wp-includes/comment.php (revision 12431) +++ wp-includes/comment.php (working copy) @@ -798,8 +798,11 @@ } /** - * Removes comment ID and maybe updates post comment count. + * Trashes or deletes a comment. * + * The comment is moved to trash instead of permanently deleted unless trash is + * disabled, item is already in the trash, or $force_delete is true. + * * The post comment count will be updated if the comment was approved and has a * post ID available. * @@ -811,14 +814,15 @@ * @uses wp_transition_comment_status() Passes new and old comment status along with $comment object * * @param int $comment_id Comment ID + * @param bool $force_delete Whether to bypass trash and force deletion. Default is false. * @return bool False if delete comment query failure, true on success. */ -function wp_delete_comment($comment_id) { +function wp_delete_comment($comment_id, $force_delete = false) { global $wpdb; if (!$comment = get_comment($comment_id)) return false; - if (wp_get_comment_status($comment_id) != 'trash' && wp_get_comment_status($comment_id) != 'spam' && EMPTY_TRASH_DAYS > 0) + if ( !$force_delete && EMPTY_TRASH_DAYS && !in_array( wp_get_comment_status($comment_id), array( 'trash', 'spam' ) ) ) return wp_trash_comment($comment_id); do_action('delete_comment', $comment_id); @@ -857,16 +861,19 @@ /** * Moves a comment to the Trash * + * If trash is disabled, comment is permanently deleted. + * * @since 2.9.0 * @uses do_action() on 'trash_comment' before trashing * @uses do_action() on 'trashed_comment' after trashing + * @uses wp_delete_comment() if trash is disabled * * @param int $comment_id Comment ID. * @return mixed False on failure */ function wp_trash_comment($comment_id) { - if ( EMPTY_TRASH_DAYS == 0 ) - return wp_delete_comment($comment_id); + if ( !EMPTY_TRASH_DAYS ) + return wp_delete_comment($comment_id, true); if ( !$comment = get_comment($comment_id) ) return false; Index: wp-includes/post.php =================================================================== --- wp-includes/post.php (revision 12431) +++ wp-includes/post.php (working copy) @@ -1155,18 +1155,22 @@ } /** - * Removes a post, attachment, or page. + * Trashes or deletes a post or page. * - * When the post and page goes, everything that is tied to it is deleted also. + * When the post and page is permanently deleted, everything that is tied to it is deleted also. * This includes comments, post meta fields, and terms associated with the post. * + * The post or page is moved to trash instead of permanently deleted unless trash is + * disabled, item is already in the trash, or $force_delete is true. + * * @since 1.0.0 * @uses do_action() on 'delete_post' before deletion unless post type is 'attachment'. * @uses do_action() on 'deleted_post' after deletion unless post type is 'attachment'. * @uses wp_delete_attachment() if post type is 'attachment'. + * @uses wp_trash_post() if item should be trashed. * * @param int $postid Post ID. - * @param bool $force_delete Whether to bypass trash and force deletion + * @param bool $force_delete Whether to bypass trash and force deletion. Defaults to false. * @return mixed False on failure */ function wp_delete_post( $postid = 0, $force_delete = false ) { @@ -1175,7 +1179,7 @@ if ( !$post = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->posts WHERE ID = %d", $postid)) ) return $post; - if ( !$force_delete && ( $post->post_type == 'post' || $post->post_type == 'page') && get_post_status( $postid ) != 'trash' && EMPTY_TRASH_DAYS > 0 ) + if ( !$force_delete && ( $post->post_type == 'post' || $post->post_type == 'page') && get_post_status( $postid ) != 'trash' && EMPTY_TRASH_DAYS ) return wp_trash_post($postid); if ( $post->post_type == 'attachment' ) @@ -1261,16 +1265,19 @@ /** * Moves a post or page to the Trash * + * If trash is disabled, the post or page is permanently deleted. + * * @since 2.9.0 * @uses do_action() on 'trash_post' before trashing * @uses do_action() on 'trashed_post' after trashing + * @uses wp_delete_post() if trash is disabled * * @param int $postid Post ID. * @return mixed False on failure */ function wp_trash_post($post_id = 0) { - if ( EMPTY_TRASH_DAYS == 0 ) - return wp_delete_post($post_id); + if ( !EMPTY_TRASH_DAYS ) + return wp_delete_post($post_id, true); if ( !$post = wp_get_single_post($post_id, ARRAY_A) ) return $post; @@ -2816,18 +2823,22 @@ } /** - * Delete an attachment. + * Trashes or deletes an attachment. * - * Will remove the file also, when the attachment is removed. Removes all post - * meta fields, taxonomy, comments, etc associated with the attachment (except - * the main post). + * When an attachment is permanently deleted, the file will also be removed. + * Deletion removes all post meta fields, taxonomy, comments, etc. associated + * with the attachment (except the main post). * + * The attachment is moved to the trash instead of permanently deleted unless trash + * for media is disabled, item is already in the trash, or $force_delete is true. + * * @since 2.0.0 * @uses $wpdb * @uses do_action() Calls 'delete_attachment' hook on Attachment ID. + * @uses MEDIA_TRASH * * @param int $postid Attachment ID. - * @param bool $force_delete Whether to bypass trash and force deletion + * @param bool $force_delete Whether to bypass trash and force deletion. Defaults to false. * @return mixed False on failure. Post data on success. */ function wp_delete_attachment( $post_id, $force_delete = false ) {