WordPress.org

Make WordPress Core

Changeset 20080


Ignore:
Timestamp:
03/02/2012 08:13:35 PM (6 years ago)
Author:
nacin
Message:

Don't autoload the uninstall_plugins option. fixes #16741.

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-admin/includes/schema.php

    r20029 r20080  
    471471    'widget_text' => array(),
    472472    'widget_rss' => array(),
     473    'uninstall_plugins' => array(),
    473474
    474475    // 2.8
     
    502503
    503504    // Set autoload to no for these options
    504     $fat_options = array( 'moderation_keys', 'recently_edited', 'blacklist_keys' );
     505    $fat_options = array( 'moderation_keys', 'recently_edited', 'blacklist_keys', 'uninstall_plugins' );
    505506
    506507    $existing_options = $wpdb->get_col("SELECT option_name FROM $wpdb->options");
  • trunk/wp-admin/includes/upgrade.php

    r20023 r20080  
    458458        upgrade_330();
    459459
    460     if ( $wp_current_db_version < 20022 )
     460    if ( $wp_current_db_version < 20080 )
    461461        upgrade_340();
    462462
     
    11531153    }
    11541154
    1155     // 3.3-beta. Can remove before release.
    1156     if ( $wp_current_db_version > 18715 && $wp_current_db_version < 19389
    1157         && is_main_site() && ! defined( 'DO_NOT_UPGRADE_GLOBAL_TABLES' ) )
    1158             delete_metadata( 'user', 0, 'dismissed_wp_pointers', '', true );
    1159 
    11601155    if ( $wp_current_db_version >= 11548 )
    11611156        return;
     
    12371232    if ( $wp_current_db_version < 20022 && is_main_site() && ! defined( 'DO_NOT_UPGRADE_GLOBAL_TABLES' ) ) {
    12381233        $wpdb->query( "DELETE FROM $wpdb->usermeta WHERE meta_key = 'themes_last_view'" );
     1234    }
     1235
     1236    if ( $wp_current_db_version < 20080 ) {
     1237        if ( 'yes' == $wpdb->get_var( "SELECT autoload FROM $wpdb->options WHERE option_name = 'uninstall_plugins'" ) ) {
     1238            $uninstall_plugins = get_option( 'uninstall_plugins' );
     1239            delete_option( 'uninstall_plugins' );
     1240            add_option( 'uninstall_plugins', $uninstall_plugins, null, 'no' );
     1241        }
    12391242    }
    12401243}
  • trunk/wp-includes/version.php

    r20079 r20080  
    1212 * @global int $wp_db_version
    1313 */
    14 $wp_db_version = 20022;
     14$wp_db_version = 20080;
    1515
    1616/**
Note: See TracChangeset for help on using the changeset viewer.