diff --git a/wp-admin/includes/class-wp-ms-themes-list-table.php b/wp-admin/includes/class-wp-ms-themes-list-table.php index 1109955971..61ae819378 100644 --- a/wp-admin/includes/class-wp-ms-themes-list-table.php +++ b/wp-admin/includes/class-wp-ms-themes-list-table.php @@ -15,14 +15,9 @@ class WP_MS_Themes_List_Table extends WP_List_Table { function __construct() { global $status, $page; - $default_status = get_user_option( 'themes_last_view' ); - if ( empty( $default_status ) ) - $default_status = 'all'; - $status = isset( $_REQUEST['theme_status'] ) ? $_REQUEST['theme_status'] : $default_status; + $status = isset( $_REQUEST['theme_status'] ) ? $_REQUEST['theme_status'] : 'all'; if ( !in_array( $status, array( 'all', 'enabled', 'disabled', 'upgrade', 'search' ) ) ) $status = 'all'; - if ( $status != $default_status && 'search' != $status ) - update_user_meta( get_current_user_id(), 'themes_last_view', $status ); $page = $this->get_pagenum(); diff --git a/wp-admin/includes/upgrade.php b/wp-admin/includes/upgrade.php index 04311d5e14..2798b08b48 100644 --- a/wp-admin/includes/upgrade.php +++ b/wp-admin/includes/upgrade.php @@ -459,7 +459,7 @@ function upgrade_all() { if ( $wp_current_db_version < 19389 ) upgrade_330(); - if ( $wp_current_db_version < 19799 ) + if ( $wp_current_db_version < 20022 ) upgrade_340(); maybe_disable_automattic_widgets(); @@ -1235,6 +1235,10 @@ function upgrade_340() { $wpdb->query("ALTER TABLE $wpdb->comments DROP INDEX comment_approved"); $wpdb->show_errors(); } + + if ( $wp_current_db_version < 20022 && is_main_site() && ! defined( 'DO_NOT_UPGRADE_GLOBAL_TABLES' ) ) { + $wpdb->query( "DELETE FROM $wpdb->usermeta WHERE meta_key = 'themes_last_view'" ); + } } /** diff --git a/wp-includes/version.php b/wp-includes/version.php index 46340733a1..9e3e678002 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -11,7 +11,7 @@ $wp_version = '3.4-alpha-20014'; * * @global int $wp_db_version */ -$wp_db_version = 19863; +$wp_db_version = 20022; /** * Holds the TinyMCE version