sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Term Splitting: Fix a reversal of parameters to wp_schedule_single_event() introduced in [33621].

Browse Source 
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.


git-svn-id: https://develop.svn.wordpress.org/trunk@33646 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Dion Hulse 2015-08-19 11:30:42 +00:00
parent 26e7094951
commit 63fd3a32dd
3 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -534,6 +534,9 @@ function upgrade_all() {
if ( $wp_current_db_version < 33055 ) if ( $wp_current_db_version < 33055 )
upgrade_430(); upgrade_430();
if ( $wp_current_db_version < 33056 )
upgrade_431();
maybe_disable_link_manager(); maybe_disable_link_manager();
maybe_disable_automattic_widgets(); 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. * Executes network-level upgrade routines.
* *

2
src/wp-includes/taxonomy.php
View File

@ -4445,7 +4445,7 @@ function _wp_batch_split_terms() {
*/ */
function _wp_check_for_scheduled_split_terms() { function _wp_check_for_scheduled_split_terms() {
if ( ! get_option( 'finished_splitting_shared_terms' ) && ! wp_next_scheduled( 'wp_batch_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' );
} }
} }

2
src/wp-includes/version.php
View File

@ -11,7 +11,7 @@ $wp_version = '4.4-alpha-33636-src';
* *
* @global int $wp_db_version * @global int $wp_db_version
*/ */
$wp_db_version = 33055; $wp_db_version = 33056;
/** /**
* Holds the TinyMCE version * Holds the TinyMCE version