WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.

Built from https://develop.svn.wordpress.org/trunk@33646


git-svn-id: http://core.svn.wordpress.org/trunk@33613 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Dion Hulse 2015-08-19 11:31:26 +00:00
parent 096b2f58fa
commit 25c5d372d3
3 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
wp-admin/includes/upgrade.php
View File

@ -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.
*

2
wp-includes/taxonomy.php
View File

@ -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' );
}
}

4
wp-includes/version.php
View File

@ -4,14 +4,14 @@
*
* @global string $wp_version
*/
$wp_version = '4.4-alpha-33645';
$wp_version = '4.4-alpha-33646';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
*
* @global int $wp_db_version
*/
$wp_db_version = 33055;
$wp_db_version = 33056;
/**
* Holds the TinyMCE version