Ticket #31625: 31625.2.diff

src/wp-admin/includes/upgrade.php

@@ -552 +552 @@
         if ( $wp_current_db_version < 36686 )
                 upgrade_450();
 
+        if ( $wp_current_db_version < 37308 )
+                upgrade_460();
+
         maybe_disable_link_manager();
 
         maybe_disable_automattic_widgets();
@@ -1685 +1688 @@
 
         // Remove unused user setting for wpLink.
         delete_user_setting( 'wplink' );
+}
+
+/**
+ * Execute changes made in WordPress 4.6.0
+ *
+ * @ignore
+ * @since 4.6.0
+ */
+function upgrade_460() {
+        // Remove plugins with callback as an array object/method as the uninstall hook
+        $uninstall_plugins = get_option( 'uninstall_plugins', array() );
+        if ( ! empty( $uninstall_plugins ) ) {
+                foreach ( $uninstall_plugins as $basename => $callback ) {
+                        if ( is_array( $callback ) && is_object( $callback[0] ) ) {
+                                unset( $uninstall_plugins[ $basename ] );
+                        }
+                }
+
+                update_option( 'uninstall_plugins', $uninstall_plugins );
+        }
 }
 
 /**