<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[12158] trunk/wp-includes/post.php: Add force delete option.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12158">12158</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2009-11-09 20:12:07 +0000 (Mon, 09 Nov 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add force delete option.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludespostphp">trunk/wp-includes/post.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post.php (12157 => 12158)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post.php 2009-11-09 18:53:21 UTC (rev 12157)
+++ trunk/wp-includes/post.php 2009-11-09 20:12:07 UTC (rev 12158)
</span><span class="lines">@@ -1149,19 +1149,20 @@
</span><span class="cx"> * @uses wp_delete_attachment() if post type is 'attachment'.
</span><span class="cx"> *
</span><span class="cx"> * @param int $postid Post ID.
</span><ins>+ * @param bool $force_delete Whether to bypass trash and force deletion
</ins><span class="cx"> * @return mixed False on failure
</span><span class="cx"> */
</span><del>-function wp_delete_post($postid = 0) {
</del><ins>+function wp_delete_post( $postid = 0, $force_delete = false ) {
</ins><span class="cx"> global $wpdb, $wp_rewrite;
</span><span class="cx">
</span><span class="cx"> if ( !$post = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->posts WHERE ID = %d", $postid)) )
</span><span class="cx"> return $post;
</span><span class="cx">
</span><del>- if ( ($post->post_type == 'post' || $post->post_type == 'page') && get_post_status($postid) != 'trash' && EMPTY_TRASH_DAYS > 0 )
- return wp_trash_post($postid);
</del><ins>+ 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);
</ins><span class="cx">
</span><span class="cx"> if ( $post->post_type == 'attachment' )
</span><del>- return wp_delete_attachment($postid);
</del><ins>+ return wp_delete_attachment( $postid, $force_delete );
</ins><span class="cx">
</span><span class="cx"> do_action('delete_post', $postid);
</span><span class="cx">
</span><span class="lines">@@ -2799,9 +2800,10 @@
</span><span class="cx"> * @uses do_action() Calls 'delete_attachment' hook on Attachment ID.
</span><span class="cx"> *
</span><span class="cx"> * @param int $postid Attachment ID.
</span><ins>+ * @param bool $force_delete Whether to bypass trash and force deletion
</ins><span class="cx"> * @return mixed False on failure. Post data on success.
</span><span class="cx"> */
</span><del>-function wp_delete_attachment($post_id) {
</del><ins>+function wp_delete_attachment( $post_id, $force_delete = false ) {
</ins><span class="cx"> global $wpdb;
</span><span class="cx">
</span><span class="cx"> if ( !$post = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->posts WHERE ID = %d", $post_id) ) )
</span><span class="lines">@@ -2810,8 +2812,8 @@
</span><span class="cx"> if ( 'attachment' != $post->post_type )
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- if ( 'trash' != $post->post_status )
- return wp_trash_post($post_id);
</del><ins>+ if ( !$force_delete && 'trash' != $post->post_status )
+ return wp_trash_post( $post_id );
</ins><span class="cx">
</span><span class="cx"> delete_post_meta($post_id, '_wp_trash_meta_status');
</span><span class="cx"> delete_post_meta($post_id, '_wp_trash_meta_time');
</span></span></pre>
</div>
</div>
</body>
</html>