Changeset 20453

Timestamp:

04/12/2012 06:49:48 PM (13 years ago)

Author:

ryan

Message:

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 #19663

Location:

trunk

Files:

• wp-admin/post-new.php (modified) (1 diff)
• wp-includes/default-filters.php (modified) (1 diff)
• wp-includes/functions.php (modified) (2 diffs)
• wp-includes/post.php (modified) (1 diff)

trunk/wp-admin/post-new.php

@@ -40 +40 @@
     wp_die( __( 'Cheatin’ uh?' ) );
 
+// Schedule auto-draft cleanup
+if ( ! wp_next_scheduled( 'wp_scheduled_auto_draft_delete' ) )
+    wp_schedule_event( time(), 'daily', 'wp_scheduled_auto_draft_delete' );
+
 wp_enqueue_script('autosave');
 

trunk/wp-includes/default-filters.php

@@ -254 +254 @@
 add_action( 'comment_form',               'wp_comment_form_unfiltered_html_nonce'          );
 add_action( 'wp_scheduled_delete',        'wp_scheduled_delete'                            );
+add_action( 'wp_scheduled_auto_draft_delete', 'wp_delete_auto_drafts'                      );
 add_action( 'admin_init',                 'send_frame_options_header',               10, 0 );
 add_action( 'importer_scheduled_cleanup', 'wp_delete_attachment'                           );

trunk/wp-includes/functions.php

@@ -3309 +3309 @@
 /**
  * Permanently deletes posts, pages, attachments, and comments which have been in the trash for EMPTY_TRASH_DAYS.
- * Deletes auto-drafts for new posts that are > 7 days old
  *
  * @since 2.9.0
@@ -3351 +3350 @@
         }
     }
-
-    // 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
 }
 

trunk/wp-includes/post.php

@@ -5165 +5165 @@
 
 /**
+ * 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
+}
+
+/**
  * Filters the request to allow for the format prefix.
  *