diff --git a/wp-admin/includes/class-theme-upgrader.php b/wp-admin/includes/class-theme-upgrader.php index 8f24d1aa59..0a73f4b86c 100644 --- a/wp-admin/includes/class-theme-upgrader.php +++ b/wp-admin/includes/class-theme-upgrader.php @@ -616,20 +616,20 @@ class Theme_Upgrader extends WP_Upgrader { * * @since 2.8.0 * - * @param bool|WP_Error $return Upgrade offer return. - * @param array $theme Theme arguments. - * @return bool|WP_Error The passed in $return param or WP_Error. + * @param bool|WP_Error $response The installation response before the installation has started. + * @param array $theme Theme arguments. + * @return bool|WP_Error The original `$response` parameter or WP_Error. */ - public function current_before( $return, $theme ) { - if ( is_wp_error( $return ) ) { - return $return; + public function current_before( $response, $theme ) { + if ( is_wp_error( $response ) ) { + return $response; } $theme = isset( $theme['theme'] ) ? $theme['theme'] : ''; - // Only run if active theme + // Only run if active theme. if ( get_stylesheet() !== $theme ) { - return $return; + return $response; } // Change to maintenance mode. Bulk edit handles this separately. @@ -637,7 +637,7 @@ class Theme_Upgrader extends WP_Upgrader { $this->maintenance_mode( true ); } - return $return; + return $response; } /** @@ -648,20 +648,20 @@ class Theme_Upgrader extends WP_Upgrader { * * @since 2.8.0 * - * @param bool|WP_Error $return Upgrade offer return. - * @param array $theme Theme arguments. - * @return bool|WP_Error The passed in $return param or WP_Error. + * @param bool|WP_Error $response The installation response after the installation has finished. + * @param array $theme Theme arguments. + * @return bool|WP_Error The original `$response` parameter or WP_Error. */ - public function current_after( $return, $theme ) { - if ( is_wp_error( $return ) ) { - return $return; + public function current_after( $response, $theme ) { + if ( is_wp_error( $response ) ) { + return $response; } $theme = isset( $theme['theme'] ) ? $theme['theme'] : ''; // Only run if active theme. if ( get_stylesheet() !== $theme ) { - return $return; + return $response; } // Ensure stylesheet name hasn't changed after the upgrade: @@ -675,7 +675,7 @@ class Theme_Upgrader extends WP_Upgrader { if ( ! $this->bulk ) { $this->maintenance_mode( false ); } - return $return; + return $response; } /** diff --git a/wp-includes/version.php b/wp-includes/version.php index 26c20f1c73..1e8a11f9fa 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -16,7 +16,7 @@ * * @global string $wp_version */ -$wp_version = '6.0-alpha-52997'; +$wp_version = '6.0-alpha-52998'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.