From 087b52dced23b3de770db2ec2b90d73e33cbe1e4 Mon Sep 17 00:00:00 2001 From: John Blackbourn Date: Mon, 5 Mar 2018 21:44:30 +0000 Subject: [PATCH] Upgrade/Install: Fix the format of the `upgrader_process_complete` actions after [42343]. More info: https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards/issues/1323 See #41057, #42505 Built from https://develop.svn.wordpress.org/trunk@42786 git-svn-id: http://core.svn.wordpress.org/trunk@42616 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/class-core-upgrader.php | 10 ++++------ wp-admin/includes/class-language-pack-upgrader.php | 14 ++++++-------- wp-admin/includes/class-plugin-upgrader.php | 14 ++++++-------- wp-includes/version.php | 2 +- 4 files changed, 17 insertions(+), 23 deletions(-) diff --git a/wp-admin/includes/class-core-upgrader.php b/wp-admin/includes/class-core-upgrader.php index 68cc1339d2..f39c300be1 100644 --- a/wp-admin/includes/class-core-upgrader.php +++ b/wp-admin/includes/class-core-upgrader.php @@ -189,12 +189,10 @@ class Core_Upgrader extends WP_Upgrader { } /** This action is documented in wp-admin/includes/class-wp-upgrader.php */ - do_action( - 'upgrader_process_complete', $this, array( - 'action' => 'update', - 'type' => 'core', - ) - ); + do_action( 'upgrader_process_complete', $this, array( + 'action' => 'update', + 'type' => 'core', + ) ); // Clear the current updates delete_site_transient( 'update_core' ); diff --git a/wp-admin/includes/class-language-pack-upgrader.php b/wp-admin/includes/class-language-pack-upgrader.php index b477625b71..a750d8aa3c 100644 --- a/wp-admin/includes/class-language-pack-upgrader.php +++ b/wp-admin/includes/class-language-pack-upgrader.php @@ -274,14 +274,12 @@ class Language_Pack_Upgrader extends WP_Upgrader { remove_action( 'upgrader_process_complete', 'wp_update_themes' ); /** This action is documented in wp-admin/includes/class-wp-upgrader.php */ - do_action( - 'upgrader_process_complete', $this, array( - 'action' => 'update', - 'type' => 'translation', - 'bulk' => true, - 'translations' => $language_updates_results, - ) - ); + do_action( 'upgrader_process_complete', $this, array( + 'action' => 'update', + 'type' => 'translation', + 'bulk' => true, + 'translations' => $language_updates_results, + ) ); // Re-add upgrade hooks. add_action( 'upgrader_process_complete', array( 'Language_Pack_Upgrader', 'async_upgrade' ), 20 ); diff --git a/wp-admin/includes/class-plugin-upgrader.php b/wp-admin/includes/class-plugin-upgrader.php index ca2621b419..fb5c1eb8c9 100644 --- a/wp-admin/includes/class-plugin-upgrader.php +++ b/wp-admin/includes/class-plugin-upgrader.php @@ -307,14 +307,12 @@ class Plugin_Upgrader extends WP_Upgrader { wp_clean_plugins_cache( $parsed_args['clear_update_cache'] ); /** This action is documented in wp-admin/includes/class-wp-upgrader.php */ - do_action( - 'upgrader_process_complete', $this, array( - 'action' => 'update', - 'type' => 'plugin', - 'bulk' => true, - 'plugins' => $plugins, - ) - ); + do_action( 'upgrader_process_complete', $this, array( + 'action' => 'update', + 'type' => 'plugin', + 'bulk' => true, + 'plugins' => $plugins, + ) ); $this->skin->bulk_footer(); diff --git a/wp-includes/version.php b/wp-includes/version.php index 4e1ecfa25a..b9d2934e39 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '5.0-alpha-42785'; +$wp_version = '5.0-alpha-42786'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.