Changes from branches/3.0/wp-admin/includes/plugin.php at r15745 to trunk/wp-admin/includes/plugin.php at r15268

File:

• trunk/wp-admin/includes/plugin.php (modified) (2 diffs)

trunk/wp-admin/includes/plugin.php

@@ -484 +484 @@
         include(WP_PLUGIN_DIR . '/' . $plugin);
         do_action( 'activate_plugin', trim( $plugin) );
-        do_action( 'activate_' . trim( $plugin ) );
         if ( $network_wide ) {
             $current[$plugin] = time();
@@ -493 +492 @@
             update_option('active_plugins', $current);
         }
+        do_action( 'activate_' . trim( $plugin ) );
         do_action( 'activated_plugin', trim( $plugin) );
         if ( ob_get_length() > 0 ) {