From 7e9060a0e45fd9a650af0778f5489162a91c8404 Mon Sep 17 00:00:00 2001 From: John Blackbourn Date: Thu, 10 Dec 2020 23:38:04 +0000 Subject: [PATCH] Upgrade/Install: Remove a duplicate description for the `upgrader_overwrote_package` action. See #51800, #9757 Built from https://develop.svn.wordpress.org/trunk@49788 git-svn-id: http://core.svn.wordpress.org/trunk@49511 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/class-plugin-upgrader.php | 6 +++--- wp-admin/includes/class-theme-upgrader.php | 11 +---------- wp-includes/version.php | 2 +- 3 files changed, 5 insertions(+), 14 deletions(-) diff --git a/wp-admin/includes/class-plugin-upgrader.php b/wp-admin/includes/class-plugin-upgrader.php index b171f9228b..09d02e2bfb 100644 --- a/wp-admin/includes/class-plugin-upgrader.php +++ b/wp-admin/includes/class-plugin-upgrader.php @@ -162,9 +162,9 @@ class Plugin_Upgrader extends WP_Upgrader { * * @since 5.5.0 * - * @param string $package The package file. - * @param array $new_plugin_data The new plugin data. - * @param string $package_type The package type (plugin or theme). + * @param string $package The package file. + * @param array $data The new plugin or theme data. + * @param string $package_type The package type ('plugin' or 'theme'). */ do_action( 'upgrader_overwrote_package', $package, $this->new_plugin_data, 'plugin' ); } diff --git a/wp-admin/includes/class-theme-upgrader.php b/wp-admin/includes/class-theme-upgrader.php index 229a8115bd..cd5f528466 100644 --- a/wp-admin/includes/class-theme-upgrader.php +++ b/wp-admin/includes/class-theme-upgrader.php @@ -270,16 +270,7 @@ class Theme_Upgrader extends WP_Upgrader { wp_clean_themes_cache( $parsed_args['clear_update_cache'] ); if ( $parsed_args['overwrite_package'] ) { - /** - * Fires when the upgrader has successfully overwritten a currently installed - * plugin or theme with an uploaded zip package. - * - * @since 5.5.0 - * - * @param string $package The package file. - * @param array $new_theme_data The new theme data. - * @param string $package_type The package type (plugin or theme). - */ + /** This action is documented in wp-admin/includes/class-plugin-upgrader.php */ do_action( 'upgrader_overwrote_package', $package, $this->new_theme_data, 'theme' ); } diff --git a/wp-includes/version.php b/wp-includes/version.php index 88da9e9e27..331178c4b8 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -13,7 +13,7 @@ * * @global string $wp_version */ -$wp_version = '5.7-alpha-49787'; +$wp_version = '5.7-alpha-49788'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.