Skip to content
Browse files

Fix irrelevant error message on plugin activation again. Props andy. …

…Fixes #15062 for the 3.0 branch. see #7671.

git-svn-id: http://svn.automattic.com/wordpress/branches/3.0@15745 1a063a9b-81f0-0310-95a4-ce76da25c4cd
  • Loading branch information...
1 parent 47aeefb commit 25e2790f37f9d77ae7771a6dfb6d41057d648660 nacin committed Oct 7, 2010
Showing with 1 addition and 1 deletion.
  1. +1 −1 wp-admin/includes/plugin.php
View
2 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();

0 comments on commit 25e2790

Please sign in to comment.
Something went wrong with that request. Please try again.