<!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" />
<title>[20453] trunk: Schedule auto-draft deletion from post-new.php instead of from admin.php.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/20453">20453</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2012-04-12 18:49:48 +0000 (Thu, 12 Apr 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Schedule auto-draft deletion from post-new.php instead of from admin.php. This provides better throttling for large multisite installs and reduces the risk of a delete avalanche.
fixes <a href="http://core.trac.wordpress.org/ticket/19663">#19663</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminpostnewphp">trunk/wp-admin/post-new.php</a></li>
<li><a href="#trunkwpincludesdefaultfiltersphp">trunk/wp-includes/default-filters.php</a></li>
<li><a href="#trunkwpincludesfunctionsphp">trunk/wp-includes/functions.php</a></li>
<li><a href="#trunkwpincludespostphp">trunk/wp-includes/post.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminpostnewphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/post-new.php (20452 => 20453)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/post-new.php 2012-04-12 17:58:20 UTC (rev 20452)
+++ trunk/wp-admin/post-new.php 2012-04-12 18:49:48 UTC (rev 20453)
</span><span class="lines">@@ -39,6 +39,10 @@
</span><span class="cx"> if ( ! current_user_can( $post_type_object->cap->edit_posts ) )
</span><span class="cx"> wp_die( __( 'Cheatin&#8217; uh?' ) );
</span><span class="cx">
</span><ins>+// Schedule auto-draft cleanup
+if ( ! wp_next_scheduled( 'wp_scheduled_auto_draft_delete' ) )
+ wp_schedule_event( time(), 'daily', 'wp_scheduled_auto_draft_delete' );
+
</ins><span class="cx"> wp_enqueue_script('autosave');
</span><span class="cx">
</span><span class="cx"> // Show post form.
</span></span></pre></div>
<a id="trunkwpincludesdefaultfiltersphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/default-filters.php (20452 => 20453)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/default-filters.php 2012-04-12 17:58:20 UTC (rev 20452)
+++ trunk/wp-includes/default-filters.php 2012-04-12 18:49:48 UTC (rev 20453)
</span><span class="lines">@@ -253,6 +253,7 @@
</span><span class="cx"> add_action( 'transition_post_status', '_update_term_count_on_transition_post_status', 10, 3 );
</span><span class="cx"> add_action( 'comment_form', 'wp_comment_form_unfiltered_html_nonce' );
</span><span class="cx"> add_action( 'wp_scheduled_delete', 'wp_scheduled_delete' );
</span><ins>+add_action( 'wp_scheduled_auto_draft_delete', 'wp_delete_auto_drafts' );
</ins><span class="cx"> add_action( 'admin_init', 'send_frame_options_header', 10, 0 );
</span><span class="cx"> add_action( 'importer_scheduled_cleanup', 'wp_delete_attachment' );
</span><span class="cx"> add_action( 'upgrader_scheduled_cleanup', 'wp_delete_attachment' );
</span></span></pre></div>
<a id="trunkwpincludesfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/functions.php (20452 => 20453)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/functions.php 2012-04-12 17:58:20 UTC (rev 20452)
+++ trunk/wp-includes/functions.php 2012-04-12 18:49:48 UTC (rev 20453)
</span><span class="lines">@@ -3308,7 +3308,6 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Permanently deletes posts, pages, attachments, and comments which have been in the trash for EMPTY_TRASH_DAYS.
</span><del>- * Deletes auto-drafts for new posts that are > 7 days old
</del><span class="cx"> *
</span><span class="cx"> * @since 2.9.0
</span><span class="cx"> */
</span><span class="lines">@@ -3350,11 +3349,6 @@
</span><span class="cx"> wp_delete_comment($comment_id);
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
- // Cleanup old auto-drafts more than 7 days old
- $old_posts = $wpdb->get_col( "SELECT ID FROM $wpdb->posts WHERE post_status = 'auto-draft' AND DATE_SUB( NOW(), INTERVAL 7 DAY ) > post_date" );
- foreach ( (array) $old_posts as $delete )
- wp_delete_post( $delete, true ); // Force delete
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunkwpincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post.php (20452 => 20453)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post.php 2012-04-12 17:58:20 UTC (rev 20452)
+++ trunk/wp-includes/post.php 2012-04-12 18:49:48 UTC (rev 20453)
</span><span class="lines">@@ -5164,6 +5164,20 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Deletes auto-drafts for new posts that are > 7 days old
+ *
+ * @since 3.4.0
+ */
+function wp_delete_auto_drafts() {
+ global $wpdb;
+
+ // Cleanup old auto-drafts more than 7 days old
+ $old_posts = $wpdb->get_col( "SELECT ID FROM $wpdb->posts WHERE post_status = 'auto-draft' AND DATE_SUB( NOW(), INTERVAL 7 DAY ) > post_date" );
+ foreach ( (array) $old_posts as $delete )
+ wp_delete_post( $delete, true ); // Force delete
+}
+
+/**
</ins><span class="cx"> * Filters the request to allow for the format prefix.
</span><span class="cx"> *
</span><span class="cx"> * @access private
</span></span></pre>
</div>
</div>
</body>
</html>