Wordpress 3.0.2

[autoinstalls/wordpress.git] / wp-admin / includes / plugin.php

diff --git a/wp-admin/includes/plugin.php b/wp-admin/includes/plugin.php
index 2ff21f8c906211f4a6d88019e96954aa77048a1b..98ee2a1be7577d8649148a8b3c77e990baa2385b 100644 (file)
--- a/wp-admin/includes/plugin.php
+++ b/wp-admin/includes/plugin.php
@@ -483,6 +483,7 @@ function activate_plugin( $plugin, $redirect = '', $network_wide = false) {
                ob_start();
                include(WP_PLUGIN_DIR . '/' . $plugin);
                do_action( 'activate_plugin', trim( $plugin) );
+               do_action( 'activate_' . trim( $plugin ) );
                if ( $network_wide ) {
                        $current[$plugin] = time();
                        update_site_option( 'active_sitewide_plugins', $current );
@@ -491,7 +492,6 @@ function activate_plugin( $plugin, $redirect = '', $network_wide = false) {
                        sort($current);
                        update_option('active_plugins', $current);
                }
-               do_action( 'activate_' . trim( $plugin ) );
                do_action( 'activated_plugin', trim( $plugin) );
                if ( ob_get_length() > 0 ) {
                        $output = ob_get_clean();