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

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

git-svn-id: http://svn.automattic.com/wordpress/trunk@20080 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
nacin 2012-03-02 20:13:35 +00:00
parent f693f33f87
commit 3985eae452
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
wp-admin/includes/schema.php
View File

@ -470,6 +470,7 @@ function populate_options() {
'widget_categories' => array(),
'widget_text' => array(),
'widget_rss' => array(),
'uninstall_plugins' => array(),
// 2.8
'timezone_string' => $timezone_string,
@ -501,7 +502,7 @@ function populate_options() {
}
// Set autoload to no for these options
$fat_options = array( 'moderation_keys', 'recently_edited', 'blacklist_keys' );
$fat_options = array( 'moderation_keys', 'recently_edited', 'blacklist_keys', 'uninstall_plugins' );
$existing_options = $wpdb->get_col("SELECT option_name FROM $wpdb->options");

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

@ -457,7 +457,7 @@ function upgrade_all() {
if ( $wp_current_db_version < 19389 )
upgrade_330();
if ( $wp_current_db_version < 20022 )
if ( $wp_current_db_version < 20080 )
upgrade_340();
maybe_disable_automattic_widgets();
@ -1152,11 +1152,6 @@ function upgrade_330() {
$wpdb->query( "DELETE FROM $wpdb->usermeta WHERE meta_key IN ('show_admin_bar_admin', 'plugins_last_view')" );
}
// 3.3-beta. Can remove before release.
if ( $wp_current_db_version > 18715 && $wp_current_db_version < 19389
&& is_main_site() && ! defined( 'DO_NOT_UPGRADE_GLOBAL_TABLES' ) )
delete_metadata( 'user', 0, 'dismissed_wp_pointers', '', true );
if ( $wp_current_db_version >= 11548 )
return;
@ -1237,6 +1232,14 @@ function upgrade_340() {
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'" );
}
if ( $wp_current_db_version < 20080 ) {
if ( 'yes' == $wpdb->get_var( "SELECT autoload FROM $wpdb->options WHERE option_name = 'uninstall_plugins'" ) ) {
$uninstall_plugins = get_option( 'uninstall_plugins' );
delete_option( 'uninstall_plugins' );
add_option( 'uninstall_plugins', $uninstall_plugins, null, 'no' );
}
}
}
/**

2
wp-includes/version.php
View File

@ -11,7 +11,7 @@ $wp_version = '3.4-alpha-20079';
*
* @global int $wp_db_version
*/
$wp_db_version = 20022;
$wp_db_version = 20080;
/**
* Holds the TinyMCE version