Changeset 29818 for trunk/src/wp-admin/includes/plugin.php

Timestamp:

10/02/2014 03:55:51 PM (10 years ago)

Author:

wonderboymusic

Message:

In activate_plugin(), do not re-run the activation routine for already-active network-wide plugins.

Adds unit test.

Props jbrinley.
Fixes #28651.

File:

• trunk/src/wp-admin/includes/plugin.php (modified) (1 diff)

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

@@ -534 +534 @@
         return $valid;
 
-    if ( !in_array($plugin, $current) ) {
+    if ( ( $network_wide && ! isset( $current[ $plugin ] ) ) || ( ! $network_wide && ! in_array( $plugin, $current ) ) ) {
         if ( !empty($redirect) )
             wp_redirect(add_query_arg('_error_nonce', wp_create_nonce('plugin-activation-error_' . $plugin), $redirect)); // we'll override this later if the plugin can be included without fatal error