From ada2858cd9911b10f3f9bb59cb2a0d94a79f24ab Mon Sep 17 00:00:00 2001 From: Drew Jaynes Date: Tue, 24 May 2016 17:52:30 +0000 Subject: [PATCH] Docs: Fix the hook doc for `upgrader_process_complete` to notate all values that might be present in the `hook_extra` array in the various update contexts. h/t Nextendweb. See #32246. Built from https://develop.svn.wordpress.org/trunk@37550 git-svn-id: http://core.svn.wordpress.org/trunk@37518 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/class-wp-upgrader.php | 15 ++++++++++----- wp-includes/version.php | 2 +- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/wp-admin/includes/class-wp-upgrader.php b/wp-admin/includes/class-wp-upgrader.php index 407f0982dc..053b0546a2 100644 --- a/wp-admin/includes/class-wp-upgrader.php +++ b/wp-admin/includes/class-wp-upgrader.php @@ -750,16 +750,21 @@ class WP_Upgrader { * * @param WP_Upgrader $this WP_Upgrader instance. In other contexts, $this, might be a * Theme_Upgrader, Plugin_Upgrader or Core_Upgrade instance. - * @param array $data { + * @param array $hook_extra { * Array of bulk item update data. * - * @type string $action Type of action. Default 'update'. - * @type string $type Type of update process. Accepts 'plugin', 'theme', or 'core'. - * @type bool $bulk Whether the update process is a bulk update. Default true. - * @type array $packages Array of plugin, theme, or core packages to update. + * @type string $action Type of action. Default 'update'. + * @type string $type Type of update process. Accepts 'plugin', 'theme', or 'core'. + * @type bool $bulk Whether the update process is a bulk update. Default true. + * @type string $plugin The base plugin path from the plugins directory. + * @type string $theme The stylesheet or template name of the theme. + * @type string $language_update_type The language pack update type. Accepts 'plugin', 'theme', + * or 'core'. + * @type object $language_update The language pack update offer. * } */ do_action( 'upgrader_process_complete', $this, $options['hook_extra'] ); + $this->skin->footer(); } diff --git a/wp-includes/version.php b/wp-includes/version.php index c9ba6f26dc..6412d45a24 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.6-alpha-37549'; +$wp_version = '4.6-alpha-37550'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.