From f68bd416e85fd6ff14cbf419b478a1bdbea2911a Mon Sep 17 00:00:00 2001
From: ryan <ryan@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Sun, 26 Oct 2008 06:33:33 +0000
Subject: [PATCH] Fix plugin activation error reporting. Props DD32. fixes
 #7671

git-svn-id: http://svn.automattic.com/wordpress/trunk@9352 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/plugins.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/wp-admin/plugins.php b/wp-admin/plugins.php
index 4e1dbeb6b..3ea4bc137 100644
--- a/wp-admin/plugins.php
+++ b/wp-admin/plugins.php
@@ -59,9 +59,8 @@ if( !empty($action) ) {
 				wp_die($valid);
 			error_reporting( E_ALL ^ E_NOTICE );
 			@ini_set('display_errors', true); //Ensure that Fatal errors are displayed.
-			$result = activate_plugin($plugin, false); 
-			if ( is_wp_error( $result ) ) 
-				wp_die($result);
+			include(WP_PLUGIN_DIR . '/' . $plugin);
+			do_action('activate_' . $plugin);
 			exit;
 			break;
 		case 'deactivate':