Ticket #7372: 7372.diff

wp-includes/update.php

@@ -90 +90 @@
         if ( !function_exists('fsockopen') || defined('WP_INSTALLING') )
                 return false;
 
-        $current = get_option( 'update_plugins' );
-
-        $time_not_changed = isset( $current->last_checked ) && 43200 > ( time() - $current->last_checked );
-
         // If running blog-side, bail unless we've not checked in the last 12 hours
-        if ( !function_exists( 'get_plugins' ) ) {
-                if ( $time_not_changed )
-                        return false;
+        if ( !function_exists( 'get_plugins' ) )
                 require_once( ABSPATH . 'wp-admin/includes/plugin.php' );
-        }
 
         $plugins = get_plugins();
         $active  = get_option( 'active_plugins' );
+        $current = get_option( 'update_plugins' );
 
         $new_option = '';
         $new_option->last_checked = time();
@@ -160 +154 @@
 
         update_option( 'update_plugins', $new_option );
 }
-if ( defined( 'WP_ADMIN' ) && WP_ADMIN )
-        add_action( 'admin_init', 'wp_update_plugins' );
-else
-        add_action( 'init', 'wp_update_plugins' );
 
+add_action( 'load-plugins.php', 'wp_update_plugins' );
+add_action( 'wp_update_plugins', 'wp_update_plugins' );
+
+if ( !wp_next_scheduled('wp_update_plugins') )
+        wp_schedule_event(time(), '5min', 'wp_update_plugins');
+
 ?>

wp-admin/includes/plugin.php

@@ -99 +99 @@
 function get_plugins($plugin_folder = '') {
         
         if ( ! $cache_plugins = wp_cache_get('plugins', 'plugins') )
-                $cached_plugins = array();
+                $cache_plugins = array();
         
         if ( isset($cache_plugins[ $plugin_folder ]) )
                 return $cache_plugins[ $plugin_folder ];