Remove the post-format-standard term on upgrade if it exists in the database. fixes #20697.

git-svn-id: https://develop.svn.wordpress.org/trunk@22422 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Andrew Nacin 2012-11-07 18:01:31 +00:00
parent 08a2d93b7c
commit 30280a363c
2 changed files with 4 additions and 2 deletions

View File

@ -399,7 +399,7 @@ function upgrade_all() {
if ( $wp_current_db_version < 20080 )
upgrade_340();
if ( $wp_current_db_version < 21811 )
if ( $wp_current_db_version < 22422 )
upgrade_350();
maybe_disable_link_manager();
@ -1204,6 +1204,8 @@ function upgrade_350() {
}
}
if ( $wp_current_db_version < 22422 && $term = get_term_by( 'slug', 'post-format-standard', 'post_format' ) )
wp_delete_term( $term->term_id, 'post_format' );
}
/**

View File

@ -11,7 +11,7 @@ $wp_version = '3.5-beta2-22407';
*
* @global int $wp_db_version
*/
$wp_db_version = 22006;
$wp_db_version = 22422;
/**
* Holds the TinyMCE version