Commit 4230af2c authored by Sergey Biryukov's avatar Sergey Biryukov
Browse files

Upgrade/Install: Pass correct argument to `clear_destination` in `Theme_Upgrader::install()`. 

Follow-up to [48390].

Props afragen, sabernhardt.
Reviewed by desrosj, SergeyBiryukov.
Merges [48685] to the 5.5 branch.
Fixes #9757.
Built from https://develop.svn.wordpress.org/branches/5.5@48687


git-svn-id: https://core.svn.wordpress.org/branches/5.5@48449 1a063a9b-81f0-0310-95a4-ce76da25c4cd
parent bd351fab

wp-admin/includes/class-plugin-upgrader.php

+1 −0
Original line number Diff line number Diff line
@@ -127,6 +127,7 @@ class Plugin_Upgrader extends WP_Upgrader { 
		$this->install_strings();



		add_filter( 'upgrader_source_selection', array( $this, 'check_package' ) );



		if ( $parsed_args['clear_update_cache'] ) {

			// Clear cache so wp_update_plugins() knows about the new plugin.

			add_action( 'upgrader_process_complete', 'wp_clean_plugins_cache', 9, 0 );

wp-admin/includes/class-theme-upgrader.php

+2 −1
Original line number Diff line number Diff line
@@ -239,6 +239,7 @@ class Theme_Upgrader extends WP_Upgrader { 


		add_filter( 'upgrader_source_selection', array( $this, 'check_package' ) );

		add_filter( 'upgrader_post_install', array( $this, 'check_parent_theme_filter' ), 10, 3 );



		if ( $parsed_args['clear_update_cache'] ) {

			// Clear cache so wp_update_themes() knows about the new theme.

			add_action( 'upgrader_process_complete', 'wp_clean_themes_cache', 9, 0 );
@@ -248,7 +249,7 @@ class Theme_Upgrader extends WP_Upgrader { 
			array(

				'package'           => $package,

				'destination'       => get_theme_root(),

				'clear_destination' => $args['overwrite_package'],

				'clear_destination' => $parsed_args['overwrite_package'],

				'clear_working'     => true,

				'hook_extra'        => array(

					'type'   => 'theme',

wp-includes/version.php

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
 *

 * @global string $wp_version

 */

$wp_version = '5.5-RC1-48681';

$wp_version = '5.5-RC1-48687';



/**

 * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.