Changeset 33877 for branches/4.3

Timestamp:

09/03/2015 03:30:26 AM (9 years ago)

Author:

dd32

Message:

Term Splitting: Switch to a faster cron unschedule process to benefit sites with thousands of affected jobs. Fix the cron hook name in the failsafe rescheduler.

Merges [33727] to the 4.3 branch
Props Otto42, dd32, peterwilsoncc
Fixes #33423 for trunk

Location:

branches/4.3

Files:

• . (modified) (1 prop)
• src/wp-admin/includes/upgrade.php (modified) (1 diff)
• src/wp-includes/taxonomy.php (modified) (2 diffs)

branches/4.3/src/wp-admin/includes/upgrade.php

@@ -1590 +1590 @@
     $cron_array = _get_cron_array();
     if ( isset( $cron_array['wp_batch_split_terms'] ) ) {
-        foreach ( $cron_array['wp_batch_split_terms'] as $timestamp_hook => $cron_data ) {
-            foreach ( $cron_data as $key => $args ) {
-                wp_unschedule_event( 'wp_batch_split_terms', $timestamp_hook, $args['args'] );
-            }
-        }
+        unset( $cron_array['wp_batch_split_terms'] );
+        _set_cron_array( $cron_array );
     }
 }

branches/4.3/src/wp-includes/taxonomy.php

@@ -4438 +4438 @@
 
 /**
- * In order to avoid the wp_batch_split_terms() job being accidentally removed,
+ * In order to avoid the _wp_batch_split_terms() job being accidentally removed,
  * check that it's still scheduled while we haven't finished splitting terms.
  *
@@ -4445 +4445 @@
  */
 function _wp_check_for_scheduled_split_terms() {
-    if ( ! get_option( 'finished_splitting_shared_terms' ) && ! wp_next_scheduled( 'wp_batch_split_terms' ) ) {
-        wp_schedule_single_event( time() + MINUTE_IN_SECONDS, 'wp_batch_split_terms' );
+    if ( ! get_option( 'finished_splitting_shared_terms' ) && ! wp_next_scheduled( 'wp_split_shared_term_batch' ) ) {
+        wp_schedule_single_event( time() + MINUTE_IN_SECONDS, 'wp_split_shared_term_batch' );
     }
 }