Changeset 33646

Timestamp:

08/19/2015 11:30:42 AM (9 years ago)

Author:

dd32

Message:

Term Splitting: Fix a reversal of parameters to wp_schedule_single_event() introduced in [33621].
The existing invalid cron entries will not be purged automatically (as the 'timestamp' is never matched) so we do this ourselves.

Props mechter for noticing!
See #30261.
Fixes #33423 for trunk.

Location:

trunk/src

Files:

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

trunk/src/wp-admin/includes/upgrade.php

@@ -534 +534 @@
     if ( $wp_current_db_version < 33055 )
         upgrade_430();
+
+    if ( $wp_current_db_version < 33056 )
+        upgrade_431();
 
     maybe_disable_link_manager();
@@ -1579 +1582 @@
 
 /**
+ * Executes changes made in WordPress 4.3.1.
+ *
+ * @since 4.3.1
+ */
+function upgrade_431() {
+    // Fix incorrect cron entries for term splitting
+    $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'] );
+            }
+        }
+    }
+}
+
+/**
  * Executes network-level upgrade routines.
  *

trunk/src/wp-includes/taxonomy.php

@@ -4446 +4446 @@
 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( 'wp_batch_split_terms', time() + MINUTE_IN_SECONDS );
+        wp_schedule_single_event( time() + MINUTE_IN_SECONDS, 'wp_batch_split_terms' );
     }
 }

trunk/src/wp-includes/version.php

@@ -12 +12 @@
  * @global int $wp_db_version
  */
-$wp_db_version = 33055;
+$wp_db_version = 33056;
 
 /**