Ticket #19663: 19663.diff

wp-includes/default-filters.php

@@ -253 +253 @@
 add_action( 'transition_post_status',     '_update_term_count_on_transition_post_status', 10, 3 );
 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'                           );
 add_action( 'upgrader_scheduled_cleanup', 'wp_delete_attachment'                           );

wp-includes/post.php

@@ -5164 +5164 @@
 }
 
 /**
+ * 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.
  *
  * @access private

wp-includes/functions.php

@@ -3308 +3308 @@
 
 /**
  * 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
  */
@@ -3350 +3349 @@
                         wp_delete_comment($comment_id);
                 }
         }
-
-        // 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
 }
 
 /**

wp-admin/post-new.php

@@ -39 +39 @@
 if ( ! current_user_can( $post_type_object->cap->edit_posts ) )
         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');
 
 // Show post form.