From b38c6036828b6eeccb770abf4f117adc45b9fc41 Mon Sep 17 00:00:00 2001
From: Andrew Nacin <nacin@git.wordpress.org>
Date: Mon, 15 Dec 2014 08:54:14 +0000
Subject: [PATCH] Rename _wp_clear_update_cache() to wp_clean_update_cache().

This makes it match most cache-clearing functions, including the ones it wraps. Also no need for it to be prefixed as "private."

wp_clean_plugins_cache() doesn't always exist, so as a quick fix, clear the transient we care to clear.

see #30369.


git-svn-id: https://develop.svn.wordpress.org/trunk@30856 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/includes/class-wp-upgrader.php | 4 ++--
 src/wp-includes/update.php                  | 9 +++++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/wp-admin/includes/class-wp-upgrader.php b/src/wp-admin/includes/class-wp-upgrader.php
index ae86f60f45..93003524a9 100644
--- a/src/wp-admin/includes/class-wp-upgrader.php
+++ b/src/wp-admin/includes/class-wp-upgrader.php
@@ -1845,7 +1845,7 @@ class Language_Pack_Upgrader extends WP_Upgrader {
 		remove_filter( 'upgrader_source_selection', array( $this, 'check_package' ) );
 
 		if ( $parsed_args['clear_update_cache'] ) {
-			_wp_clear_update_cache();
+			wp_clean_update_cache();
 		}
 
 		return $results;
@@ -2776,7 +2776,7 @@ class WP_Automatic_Updater {
 			}
 
 			// Clear existing caches
-			_wp_clear_update_cache();
+			wp_clean_update_cache();
 
 			wp_version_check();  // check for Core updates
 			wp_update_themes();  // Check for Theme updates
diff --git a/src/wp-includes/update.php b/src/wp-includes/update.php
index 4d62cc82e7..597a020f83 100644
--- a/src/wp-includes/update.php
+++ b/src/wp-includes/update.php
@@ -655,7 +655,12 @@ function wp_schedule_update_checks() {
  *
  * @since 4.1.0
  */
-function _wp_clear_update_cache() {
+function wp_clean_update_cache() {
+	if ( function_exists( 'wp_clean_plugins_cache' ) ) {
+		wp_clean_plugins_cache();
+	} else {
+		delete_site_transient( 'update_plugins' );
+	}
 	wp_clean_plugins_cache();
 	wp_clean_themes_cache();
 	delete_site_transient( 'update_core' );
@@ -683,7 +688,7 @@ add_action( 'admin_init', '_maybe_update_themes' );
 add_action( 'wp_update_themes', 'wp_update_themes' );
 add_action( 'upgrader_process_complete', 'wp_update_themes', 10, 0 );
 
-add_action( 'update_option_WPLANG', '_wp_clear_update_cache' , 10, 0 );
+add_action( 'update_option_WPLANG', 'wp_clean_update_cache' , 10, 0 );
 
 add_action( 'wp_maybe_auto_update', 'wp_maybe_auto_update' );