Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-12-23 17:48:01 +01:00
Code Issues Projects Releases Wiki Activity

Split upgrade_430() into two so that split_all_shared_terms() runs when upgrade_430_fix_comments() bails early.

Browse Source 
See [32814], #30261, [32364], #32165

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


git-svn-id: http://core.svn.wordpress.org/trunk@32991 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Dion Hulse 2015-07-01 07:35:24 +00:00
parent c261ad2c57
commit ebb6aa1d4a
2 changed files with 51 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1522,6 +1522,25 @@ function upgrade_430() {
global $wp_current_db_version, $wpdb;
if ( $wp_current_db_version < 32364 ) {
upgrade_430_fix_comments();
}
if ( $wp_current_db_version < 32814 ) {
split_all_shared_terms();
}
}
/**
* Execute comments changes made in WordPress 4.3.0.
*
* @since 4.3.0
*
* @global int $wp_current_db_version
* @global wpdb $wpdb
*/
function upgrade_430_fix_comments() {
global $wp_current_db_version, $wpdb;
$content_length = $wpdb->get_col_length( $wpdb->comments, 'comment_content' );
if ( is_wp_error( $content_length ) ) {
@ -1558,11 +1577,6 @@ function upgrade_430() {
foreach ( $comments as $comment ) {
wp_delete_comment( $comment->comment_ID, true );
}
}
if ( $wp_current_db_version < 32814 ) {
split_all_shared_terms();
}
}
/**

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.3-alpha-33019';
$wp_version = '4.3-alpha-33020';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.