Changeset 20080 for trunk/wp-admin/includes/upgrade.php

Timestamp:

03/02/2012 08:13:35 PM (15 years ago)

Author:

nacin

Message:

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

File:

• trunk/wp-admin/includes/upgrade.php (modified) (3 diffs)

trunk/wp-admin/includes/upgrade.php

@@ -458 +458 @@
                 upgrade_330();
 
-        if ( $wp_current_db_version < 20022 )
+        if ( $wp_current_db_version < 20080 )
                 upgrade_340();
 
@@ -1153 +1153 @@
         }
 
-        // 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 +1232 @@
         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' );
+                }
         }
 }