Changeset 15745

Timestamp:

10/07/2010 06:14:53 PM (14 years ago)

Author:

nacin

Message:

Fix irrelevant error message on plugin activation again. Props andy. Fixes #15062 for the 3.0 branch. see #7671.

File:

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

branches/3.0/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();
@@ -492 +493 @@
             update_option('active_plugins', $current);
         }
-        do_action( 'activate_' . trim( $plugin ) );
         do_action( 'activated_plugin', trim( $plugin) );
         if ( ob_get_length() > 0 ) {