X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/607b7e02d77e7326161e8ec15639052d2040f745..ef91a7f4f3c6468973e192335a27ec0e0faca0b5:/wp-admin/includes/class-plugin-upgrader.php

diff --git a/wp-admin/includes/class-plugin-upgrader.php b/wp-admin/includes/class-plugin-upgrader.php
index ffb46204..1327d28c 100644
--- a/wp-admin/includes/class-plugin-upgrader.php
+++ b/wp-admin/includes/class-plugin-upgrader.php
@@ -101,8 +101,10 @@ class Plugin_Upgrader extends WP_Upgrader {
 		$this->install_strings();
 
 		add_filter('upgrader_source_selection', array($this, 'check_package') );
-		// Clear cache so wp_update_plugins() knows about the new plugin.
-		add_action( 'upgrader_process_complete', 'wp_clean_plugins_cache', 9, 0 );
+		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 );
+		}
 
 		$this->run( array(
 			'package' => $package,
@@ -168,8 +170,10 @@ class Plugin_Upgrader extends WP_Upgrader {
 		add_filter('upgrader_pre_install', array($this, 'deactivate_plugin_before_upgrade'), 10, 2);
 		add_filter('upgrader_clear_destination', array($this, 'delete_old_plugin'), 10, 4);
 		//'source_selection' => array($this, 'source_selection'), //there's a trac ticket to move up the directory for zip's which are made a bit differently, useful for non-.org plugins.
-		// Clear cache so wp_update_plugins() knows about the new plugin.
-		add_action( 'upgrader_process_complete', 'wp_clean_plugins_cache', 9, 0 );
+		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 );
+		}
 
 		$this->run( array(
 			'package' => $r->package,
@@ -227,7 +231,6 @@ class Plugin_Upgrader extends WP_Upgrader {
 		$current = get_site_transient( 'update_plugins' );
 
 		add_filter('upgrader_clear_destination', array($this, 'delete_old_plugin'), 10, 4);
-		add_action( 'upgrader_process_complete', 'wp_clean_plugins_cache', 9, 0 );
 
 		$this->skin->header();
 
@@ -294,6 +297,9 @@ class Plugin_Upgrader extends WP_Upgrader {
 
 		$this->maintenance_mode(false);
 
+		// Force refresh of plugin update information.
+		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',
@@ -307,12 +313,8 @@ class Plugin_Upgrader extends WP_Upgrader {
 		$this->skin->footer();
 
 		// Cleanup our hooks, in case something else does a upgrade on this connection.
-		remove_action( 'upgrader_process_complete', 'wp_clean_plugins_cache', 9 );
 		remove_filter('upgrader_clear_destination', array($this, 'delete_old_plugin'));
 
-		// Force refresh of plugin update information.
-		wp_clean_plugins_cache( $parsed_args['clear_update_cache'] );
-
 		return $results;
 	}