Changeset 30856

Timestamp:

12/15/2014 08:54:14 AM (10 years ago)

Author:

nacin

Message:

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.

Location:

trunk/src

Files:

• wp-admin/includes/class-wp-upgrader.php (modified) (2 diffs)
• wp-includes/update.php (modified) (2 diffs)

trunk/src/wp-admin/includes/class-wp-upgrader.php

@@ -1846 +1846 @@
 
         if ( $parsed_args['clear_update_cache'] ) {
-            _wp_clear_update_cache();
+            wp_clean_update_cache();
         }
 
@@ -2777 +2777 @@
 
             // Clear existing caches
-            _wp_clear_update_cache();
+            wp_clean_update_cache();
 
             wp_version_check();  // check for Core updates

trunk/src/wp-includes/update.php

@@ -656 +656 @@
  * @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();
@@ -684 +689 @@
 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' );