Changeset 16012

Timestamp:

10/27/2010 01:40:14 PM (14 years ago)

Author:

scribu

Message:

Don't call activation hooks when upgrading. Props joelhardi for initial patch. See #14915

Location:

trunk/wp-admin

Files:

• includes/plugin.php (modified) (5 diffs)
• update.php (modified) (1 diff)

trunk/wp-admin/includes/plugin.php

@@ -461 +461 @@
  * @param string $plugin Plugin path to main plugin file with plugin data.
  * @param string $redirect Optional. URL to redirect to.
- * @param bool $network_wide Whether to enable the plugin for all sites in the network or just the current site.  Multisite only. Default is false.
+ * @param bool $network_wide Whether to enable the plugin for all sites in the 
+ *   network or just the current site. Multisite only. Default is false.
+ * @param bool $silent Prevent calling activation hooks. Optional, default is false.
  * @return WP_Error|null WP_Error on invalid file or null on success.
  */
-function activate_plugin( $plugin, $redirect = '', $network_wide = false) {
+function activate_plugin( $plugin, $redirect = '', $network_wide = false, $silent = false ) {
     $plugin = plugin_basename( trim( $plugin ) );
 
@@ -483 +485 @@
         ob_start();
         include(WP_PLUGIN_DIR . '/' . $plugin);
-        do_action( 'activate_plugin', $plugin, $network_wide );
-        do_action( 'activate_' . $plugin, $network_wide );
+
+        if ( ! $silent ) {
+            do_action( 'activate_plugin', $plugin, $network_wide );
+            do_action( 'activate_' . $plugin, $network_wide );
+        }
+
         if ( $network_wide ) {
             $current[$plugin] = time();
@@ -493 +499 @@
             update_option('active_plugins', $current);
         }
-        do_action( 'activated_plugin', $plugin, $network_wide );
+
+        if ( ! $silent ) {
+            do_action( 'activated_plugin', $plugin, $network_wide );
+        }
+
         if ( ob_get_length() > 0 ) {
             $output = ob_get_clean();
@@ -513 +523 @@
  *
  * @param string|array $plugins Single plugin or list of plugins to deactivate.
- * @param bool $silent Optional, default is false. Prevent calling deactivate hook.
+ * @param bool $silent Prevent calling deactivation hooks. Default is false.
  */
 function deactivate_plugins( $plugins, $silent = false ) {
@@ -567 +577 @@
  * @param string $redirect Redirect to page after successful activation.
  * @param bool $network_wide Whether to enable the plugin for all sites in the network.
+ * @param bool $silent Prevent calling activation hooks. Default is false.
  * @return bool|WP_Error True when finished or WP_Error if there were errors during a plugin activation.
  */
-function activate_plugins($plugins, $redirect = '', $network_wide) {
+function activate_plugins( $plugins, $redirect = '', $network_wide = false, $silent = false ) {
     if ( !is_array($plugins) )
         $plugins = array($plugins);
 
     $errors = array();
-    foreach ( (array) $plugins as $plugin ) {
+    foreach ( $plugins as $plugin ) {
         if ( !empty($redirect) )
             $redirect = add_query_arg('plugin', $plugin, $redirect);
-        $result = activate_plugin($plugin, $redirect, $network_wide);
+        $result = activate_plugin($plugin, $redirect, $network_wide, $silent);
         if ( is_wp_error($result) )
             $errors[$plugin] = $result;

trunk/wp-admin/update.php

@@ -72 +72 @@
         if ( ! isset($_GET['failure']) && ! isset($_GET['success']) ) {
             wp_redirect( admin_url('update.php?action=activate-plugin&failure=true&plugin=' . $plugin . '&_wpnonce=' . $_GET['_wpnonce']) );
-            activate_plugin( $plugin, '', ! empty( $_GET['networkwide'] ) );
+            activate_plugin( $plugin, '', ! empty( $_GET['networkwide'] ), true );
             wp_redirect( admin_url('update.php?action=activate-plugin&success=true&plugin=' . $plugin . '&_wpnonce=' . $_GET['_wpnonce']) );
             die();