From 39509735837a10990670da9ccc4fbc9af1e90e0e Mon Sep 17 00:00:00 2001
From: scribu <scribu@git.wordpress.org>
Date: Thu, 7 Oct 2010 15:27:47 +0000
Subject: [PATCH] Fix irrelevant error message on plugin activation again.
 Props andy. Fixes #7671

git-svn-id: https://develop.svn.wordpress.org/trunk@15744 602fd350-edb4-49c9-b593-d223f7449a82
---
 wp-admin/includes/plugin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wp-admin/includes/plugin.php b/wp-admin/includes/plugin.php
index a53ddf5ac2..69b09edd44 100644
--- 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();