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

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

git-svn-id: http://core.svn.wordpress.org/trunk@22422 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Nacin 2012-11-07 18:01:31 +00:00
parent 15f0f2524e
commit a5c0829f35
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -399,7 +399,7 @@ function upgrade_all() {
if ( $wp_current_db_version < 20080 ) if ( $wp_current_db_version < 20080 )
upgrade_340(); upgrade_340();
if ( $wp_current_db_version < 21811 ) if ( $wp_current_db_version < 22422 )
upgrade_350(); upgrade_350();
maybe_disable_link_manager(); 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' );
} }
/** /**

2
wp-includes/version.php
View File

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