diff --git a/src/wp-admin/includes/upgrade.php b/src/wp-admin/includes/upgrade.php index 86d8cf91dd..8e6b10f011 100644 --- a/src/wp-admin/includes/upgrade.php +++ b/src/wp-admin/includes/upgrade.php @@ -534,6 +534,9 @@ function upgrade_all() { if ( $wp_current_db_version < 33055 ) upgrade_430(); + if ( $wp_current_db_version < 33056 ) + upgrade_431(); + maybe_disable_link_manager(); maybe_disable_automattic_widgets(); @@ -1577,6 +1580,23 @@ function upgrade_430_fix_comments() { } } +/** + * 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. * diff --git a/src/wp-includes/taxonomy.php b/src/wp-includes/taxonomy.php index 1db44dcd2d..989fb8a599 100644 --- a/src/wp-includes/taxonomy.php +++ b/src/wp-includes/taxonomy.php @@ -4445,7 +4445,7 @@ function _wp_batch_split_terms() { */ 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' ); } } diff --git a/src/wp-includes/version.php b/src/wp-includes/version.php index 12d483c137..a4da67a8e9 100644 --- a/src/wp-includes/version.php +++ b/src/wp-includes/version.php @@ -11,7 +11,7 @@ $wp_version = '4.4-alpha-33636-src'; * * @global int $wp_db_version */ -$wp_db_version = 33055; +$wp_db_version = 33056; /** * Holds the TinyMCE version