Changeset 27769

Timestamp:

03/27/2014 02:01:29 AM (11 years ago)

Author:

nacin

Message:

Fix docs for hooks in deactivate_plugins() and activate_plugin(). see #27189, #27188.

File:

• trunk/src/wp-admin/includes/plugin.php (modified) (6 diffs)

trunk/src/wp-admin/includes/plugin.php

@@ -543 +543 @@
         if ( ! $silent ) {
             /**
-             * Fires before a plugin is activated in activate_plugin() when the $silent parameter is false.
+             * Fires before a plugin is activated.
+             *
+             * If a plugin is silently activated (such as during an update),
+             * this hook does not fire.
              *
              * @since 2.9.0
@@ -554 +557 @@
 
             /**
-             * Fires before a plugin is activated in activate_plugin() when the $silent parameter is false.
-             *
-             * The action concatenates the 'activate_' prefix with the $plugin value passed to
-             * activate_plugin() to create a dynamically-named action.
+             * Fires as a specific plugin is being deactivated.
+             *
+             * This hook is the "deactivation" hook used internally by
+             * register_deactivation_hook(). The dynamic portion of the
+             * hook name, $plugin. refers to the plugin basename.
+             *
+             * If a plugin is silently activated (such as during an update),
+             * this hook does not fire.
              *
              * @since 2.0.0
@@ -578 +585 @@
         if ( ! $silent ) {
             /**
-             * Fires after a plugin has been activated in activate_plugin() when the $silent parameter is false.
+             * Fires after a plugin has been activated.
+             *
+             * If a plugin is silently activated (such as during an update),
+             * this hook does not fire.
              *
              * @since 2.9.0
@@ -627 +637 @@
         if ( ! $silent ) {
             /**
-             * Fires for each plugin being deactivated in deactivate_plugins(), before deactivation
-             * and when the $silent parameter is false.
+             * Fires before a plugin is deactivated.
+             *
+             * If a plugin is silently deactivated (such as during an update),
+             * this hook does not fire.
              *
              * @since 2.9.0
@@ -658 +670 @@
         if ( ! $silent ) {
             /**
-             * Fires before a specific plugin is deactivated.
-             *
-             * The dynamic portion of the hook name, $plugin. refers to the plugin basename.
-             *
-             * The hook only first when the $silent parameter is false.
+             * Fires as a specific plugin is being deactivated.
+             *
+             * This hook is the "deactivation" hook used internally by
+             * register_deactivation_hook(). The dynamic portion of the
+             * hook name, $plugin. refers to the plugin basename.
+             *
+             * If a plugin is silently deactivated (such as during an update),
+             * this hook does not fire.
              *
              * @since 2.0.0
@@ -672 +687 @@
 
             /**
-             * Fires before a plugin is deactivated.
-             *
-             * The hook only fies when the $silent parameter is false.
+             * Fires after a plugin is deactivated.
+             *
+             * If a plugin is silently deactivated (such as during an update),
+             * this hook does not fire.
              *
              * @since 2.9.0