Ticket #20241: allow_plugin_to_register_other_plugins.patch

wp-admin/includes/plugin.php

@@ -522 +522 @@
                         do_action( 'activate_plugin', $plugin, $network_wide );
                         do_action( 'activate_' . $plugin, $network_wide );
                 }
+                
+                // Check active_plugins again - the activated plugin may have activated
+                // other plugins during activation.
+                $current = get_option( 'active_plugins', array() );
 
                 if ( $network_wide ) {
                         $current[$plugin] = time();
@@ -560 +564 @@
 function deactivate_plugins( $plugins, $silent = false ) {
         if ( is_multisite() )
                 $network_current = get_site_option( 'active_sitewide_plugins', array() );
-        $current = get_option( 'active_plugins', array() );
         $do_blog = $do_network = false;
 
         foreach ( (array) $plugins as $plugin ) {
@@ -573 +576 @@
                 if ( ! $silent )
                         do_action( 'deactivate_plugin', $plugin, $network_wide );
 
+                if ( ! $silent ) {
+                        do_action( 'deactivate_' . $plugin, $network_wide );
+                        do_action( 'deactivated_plugin', $plugin, $network_wide );
+                }
+                
+                // Check active_plugins now, not earlier - the activated plugin may have 
+                // deactivated other plugins during deactivation.
+                $current = get_option( 'active_plugins', array() );
+
                 if ( $network_wide ) {
                         $do_network = true;
                         unset( $network_current[ $plugin ] );
@@ -583 +595 @@
                                 array_splice( $current, $key, 1 );
                         }
                 }
-
-                if ( ! $silent ) {
-                        do_action( 'deactivate_' . $plugin, $network_wide );
-                        do_action( 'deactivated_plugin', $plugin, $network_wide );
-                }
+                
+                if ( $do_blog )
+                  update_option('active_plugins', $current);
+                if ( $do_network )
+                  update_site_option( 'active_sitewide_plugins', $network_current );
         }
-
-        if ( $do_blog )
-                update_option('active_plugins', $current);
-        if ( $do_network )
-                update_site_option( 'active_sitewide_plugins', $network_current );
 }
 
 /**