Ticket #28651: 28651.patch

src/wp-admin/includes/plugin.php

@@ -533 +533 @@
         if ( is_wp_error($valid) )
                 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
                 ob_start();

tests/phpunit/tests/ms.php

@@ -301 +301 @@
                 $this->assertEquals( 1, $this->plugin_hook_count ); // testing actions and silent mode
         }
 
+        /**
+         * @ticket 28651
+         */
+        function test_duplicate_network_active_plugin() {
+                $path = "hello.php";
+                $mock = new MockAction();
+                add_action( 'activate_' . $path, array ( $mock, 'action' ) );
+
+                // should activate on the first try
+                activate_plugin( $path, '', true );
+                $active_plugins = wp_get_active_network_plugins();
+                $this->assertCount( 1, $active_plugins );
+                $this->assertEquals( 1, $mock->get_call_count() );
+
+                // should do nothing on the second try
+                activate_plugin( $path, '', true );
+                $active_plugins = wp_get_active_network_plugins();
+                $this->assertCount( 1, $active_plugins );
+                $this->assertEquals( 1, $mock->get_call_count() );
+
+                remove_action( 'activate_' . $path, array ( $mock, 'action' ) );
+        }
+
         function _helper_deactivate_hook() {
                 $this->plugin_hook_count++;
         }