Don't autoload the uninstall_plugins option. fixes #16741.
git-svn-id: https://develop.svn.wordpress.org/trunk@20080 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
parent
58acedae74
commit
129754ed3d
|
@ -470,6 +470,7 @@ function populate_options() {
|
||||||
'widget_categories' => array(),
|
'widget_categories' => array(),
|
||||||
'widget_text' => array(),
|
'widget_text' => array(),
|
||||||
'widget_rss' => array(),
|
'widget_rss' => array(),
|
||||||
|
'uninstall_plugins' => array(),
|
||||||
|
|
||||||
// 2.8
|
// 2.8
|
||||||
'timezone_string' => $timezone_string,
|
'timezone_string' => $timezone_string,
|
||||||
|
@ -501,7 +502,7 @@ function populate_options() {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Set autoload to no for these 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");
|
$existing_options = $wpdb->get_col("SELECT option_name FROM $wpdb->options");
|
||||||
|
|
||||||
|
|
|
@ -457,7 +457,7 @@ function upgrade_all() {
|
||||||
if ( $wp_current_db_version < 19389 )
|
if ( $wp_current_db_version < 19389 )
|
||||||
upgrade_330();
|
upgrade_330();
|
||||||
|
|
||||||
if ( $wp_current_db_version < 20022 )
|
if ( $wp_current_db_version < 20080 )
|
||||||
upgrade_340();
|
upgrade_340();
|
||||||
|
|
||||||
maybe_disable_automattic_widgets();
|
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')" );
|
$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 )
|
if ( $wp_current_db_version >= 11548 )
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
@ -1237,6 +1232,14 @@ function upgrade_340() {
|
||||||
if ( $wp_current_db_version < 20022 && is_main_site() && ! defined( 'DO_NOT_UPGRADE_GLOBAL_TABLES' ) ) {
|
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'" );
|
$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' );
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -11,7 +11,7 @@ $wp_version = '3.4-alpha-20079';
|
||||||
*
|
*
|
||||||
* @global int $wp_db_version
|
* @global int $wp_db_version
|
||||||
*/
|
*/
|
||||||
$wp_db_version = 20022;
|
$wp_db_version = 20080;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Holds the TinyMCE version
|
* Holds the TinyMCE version
|
||||||
|
|
Loading…
Reference in New Issue