From 6209a40fd9d4f10869863f299ef9e1892ce8b06f Mon Sep 17 00:00:00 2001 From: desrosj Date: Tue, 28 Jul 2020 18:16:07 +0000 Subject: [PATCH] Upgrade/Install: Clarify the descriptions for `install_(plugin|theme)_overwrite_actions`. See #9757. Built from https://develop.svn.wordpress.org/trunk@48677 git-svn-id: http://core.svn.wordpress.org/trunk@48439 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/class-plugin-installer-skin.php | 3 ++- wp-admin/includes/class-theme-installer-skin.php | 3 ++- wp-includes/version.php | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/wp-admin/includes/class-plugin-installer-skin.php b/wp-admin/includes/class-plugin-installer-skin.php index 65c0088d67..5bb19ebfbc 100644 --- a/wp-admin/includes/class-plugin-installer-skin.php +++ b/wp-admin/includes/class-plugin-installer-skin.php @@ -325,7 +325,8 @@ class Plugin_Installer_Skin extends WP_Upgrader_Skin { ); /** - * Filters the list of action links available following a single plugin installation failed but overwrite is allowed. + * Filters the list of action links available following a single plugin installation + * failure when overwriting is allowed. * * @since 5.5.0 * diff --git a/wp-admin/includes/class-theme-installer-skin.php b/wp-admin/includes/class-theme-installer-skin.php index 9d93bcfadf..16e99332a6 100644 --- a/wp-admin/includes/class-theme-installer-skin.php +++ b/wp-admin/includes/class-theme-installer-skin.php @@ -358,7 +358,8 @@ class Theme_Installer_Skin extends WP_Upgrader_Skin { ); /** - * Filters the list of action links available following a single theme installation failed but overwrite is allowed. + * Filters the list of action links available following a single theme installation + * failure when overwriting is allowed. * * @since 5.5.0 * diff --git a/wp-includes/version.php b/wp-includes/version.php index adb49c45aa..fe8d59e57b 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -13,7 +13,7 @@ * * @global string $wp_version */ -$wp_version = '5.5-beta4-48676'; +$wp_version = '5.5-beta4-48677'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.