Changes from trunk/wp-includes/update.php at r8317 to branches/2.6/wp-includes/update.php at r8521

File:

• branches/2.6/wp-includes/update.php (modified) (3 diffs)

branches/2.6/wp-includes/update.php

@@ -91 +91 @@
                 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();
+        $time_not_changed = isset( $current->last_checked ) && 43200 > ( time() - $current->last_checked );
 
         $plugin_changed = false;
@@ -119 +114 @@
                 if ( strval($current->checked[ $file ]) !== strval($p['Version']) )
                         $plugin_changed = true;
+        }
+
+        foreach ( (array) $current->response as $plugin_file => $update_details ) {
+                if ( ! isset($plugins[ $plugin_file ]) ) {
+                        $plugin_changed = true;
+                }
         }
 
@@ -155 +156 @@
         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' );
+
+function _maybe_update_plugins() {
+        $current = get_option( 'update_plugins' );
+        if ( isset( $current->last_checked ) && 43200 > ( time() - $current->last_checked ) )
+                return;
+        wp_update_plugins();
+}
+
+add_action( 'load-plugins.php', 'wp_update_plugins' );
+add_action( 'admin_init', '_maybe_update_plugins' );
+add_action( 'wp_update_plugins', 'wp_update_plugins' );
+
+if ( !wp_next_scheduled('wp_update_plugins') )
+        wp_schedule_event(time(), 'twicedaily', 'wp_update_plugins');
 
 ?>