Changeset 37965

Timestamp:

07/05/2016 01:27:38 PM (8 years ago)

Author:

ocean90

Message:

Plugins: Clean up uninstall_plugins option during database upgrade.

register_uninstall_hook() is designed to be given a function callback (or a static class variable), not an array/object instance. This got blocked in [16339] but the option itself was never cleaned up.

Props polevaultweb.
Fixes #31625.

Location:

trunk/src

Files:

• wp-admin/includes/upgrade.php (modified) (2 diffs)
• wp-includes/version.php (modified) (1 diff)

trunk/src/wp-admin/includes/upgrade.php

@@ -556 +556 @@
         upgrade_450();
 
-    if ( $wp_current_db_version < 37854 )
+    if ( $wp_current_db_version < 37965 )
         upgrade_460();
 
@@ -1700 +1700 @@
  * @since 4.6.0
  *
- * @global int  $wp_current_db_version Current database version.
- * @global wpdb $wpdb                  WordPress database abstraction object.
+ * @global int $wp_current_db_version Current database version.
  */
 function upgrade_460() {
-    delete_post_meta_by_key( '_post_restored_from' );
+    global $wp_current_db_version;
+
+    // Remove unused post meta.
+    if ( $wp_current_db_version < 37854 ) {
+        delete_post_meta_by_key( '_post_restored_from' );
+    }
+
+    // Remove plugins with callback as an array object/method as the uninstall hook, see #13786.
+    if ( $wp_current_db_version < 37965 ) {
+        $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 );
+        }
+    }
 }
 

trunk/src/wp-includes/version.php

@@ -12 +12 @@
  * @global int $wp_db_version
  */
-$wp_db_version = 37854;
+$wp_db_version = 37965;
 
 /**