Ticket #38899: 38899.1.diff

src/wp-admin/admin.php

@@ -83 +83 @@
 
 auth_redirect();
 
-// Schedule trash collection
-if ( ! wp_next_scheduled( 'wp_scheduled_delete' ) && ! wp_installing() )
-        wp_schedule_event(time(), 'daily', 'wp_scheduled_delete');
-
 set_screen_options();
 
 $date_format = __( 'F j, Y' );

src/wp-admin/post-new.php

@@ -62 +62 @@
         );
 }
 
-// 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' );
 
 if ( is_multisite() ) {

src/wp-includes/default-filters.php

@@ -285 +285 @@
 // WP Cron
 if ( !defined( 'DOING_CRON' ) )
         add_action( 'init', 'wp_cron' );
+add_action( 'init', 'wp_schedule_garbage_collection' );
 
 // 2 Actions 2 Furious
 add_action( 'do_feed_rdf',                'do_feed_rdf',                             10, 1 );

src/wp-includes/functions.php

@@ -4663 +4663 @@
 }
 
 /**
+ * Schedule events for garbage collection.
+ *
+ * Ensure that trashed posts and auto-drafts get garbage-collected by WP Cron.
+ *
+ * @since 4.7.0
+ */
+function wp_schedule_garbage_collection() {
+        if ( wp_installing() ) {
+                return;
+        }
+
+        // Ensure that auto-draft posts will get garbage-collected.
+        if ( ! wp_next_scheduled( 'wp_scheduled_auto_draft_delete' ) ) {
+                wp_schedule_event( time(), 'daily', 'wp_scheduled_auto_draft_delete' );
+        }
+
+        // Schedule trash collection.
+        if ( ! wp_next_scheduled( 'wp_scheduled_delete' ) ) {
+                wp_schedule_event( time(), 'daily', 'wp_scheduled_delete' );
+        }
+}
+
+/**
  * Permanently delete comments or posts of any type that have held a status
  * of 'trash' for the number of days defined in EMPTY_TRASH_DAYS.
  *