golem
/
twentyGOLEM
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove old metaboxorder settings. see #13424 

git-svn-id: http://svn.automattic.com/wordpress/trunk@14726 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2010-05-18 15:30:05 +00:00
parent bc1bf148e4
commit e070242b59
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -440,7 +440,7 @@ function upgrade_all() {
if ( $wp_current_db_version < 11958 )
upgrade_290();
if ( $wp_current_db_version < 14595 )
if ( $wp_current_db_version < 14726 )
upgrade_300();
maybe_disable_automattic_widgets();
@ -1135,10 +1135,10 @@ function upgrade_300() {
if ( $wp_current_db_version >= 13802 && $wp_current_db_version < 13974 )
$wpdb->update( $wpdb->postmeta, array( 'meta_value' => '' ), array( 'meta_key' => '_menu_item_target', 'meta_value' => '_self' ) );
// 3.0-beta metabox changes. can be removed before release. // r13551
if ( ( !is_multisite() || is_main_site() ) && $wp_current_db_version >= 13309 && $wp_current_db_version < 14595 ) {
// 3.0-beta metabox changes. can be removed before release (except metaboxorder). // r13551
if ( ( !is_multisite() || is_main_site() ) && $wp_current_db_version >= 13309 && $wp_current_db_version < 14726 ) {
$prefix = like_escape($wpdb->base_prefix);
$wpdb->query( "DELETE FROM $wpdb->usermeta WHERE meta_key LIKE '{$prefix}%meta-box-hidden%' OR meta_key LIKE '{$prefix}%closedpostboxes%' OR meta_key LIKE '{$prefix}%manage-%-columns-hidden%' OR meta_key LIKE '{$prefix}%meta-box-order%' OR meta_key LIKE '{$prefix}%screen_layout%'" );
$wpdb->query( "DELETE FROM $wpdb->usermeta WHERE meta_key LIKE '{$prefix}%meta-box-hidden%' OR meta_key LIKE '{$prefix}%closedpostboxes%' OR meta_key LIKE '{$prefix}%manage-%-columns-hidden%' OR meta_key LIKE '{$prefix}%meta-box-order%' OR meta_key LIKE '{$prefix}%metaboxorder%' OR meta_key LIKE '{$prefix}%screen_layout%'" );
}
}

2
wp-includes/version.php
View File

@ -15,7 +15,7 @@ $wp_version = '3.0-beta2-14697';
*
* @global int $wp_db_version
*/
$wp_db_version = 14651;
$wp_db_version = 14726;
/**
* Holds the TinyMCE version