Changeset 8514

Timestamp:

08/01/2008 04:26:32 AM (16 years ago)

Author:

ryan

Message:

Don't run get_plugins() on every admin page load. Use cron for async update plugin requests. see #7372

Location:

trunk

Files:

• wp-admin/includes/plugin.php (modified) (1 diff)
• wp-includes/cron.php (modified) (1 diff)
• wp-includes/update.php (modified) (2 diffs)

trunk/wp-admin/includes/plugin.php

@@ -100 +100 @@
     
     if ( ! $cache_plugins = wp_cache_get('plugins', 'plugins') )
-        $cached_plugins = array();
+        $cache_plugins = array();
     
     if ( isset($cache_plugins[ $plugin_folder ]) )

trunk/wp-includes/cron.php

@@ -134 +134 @@
     $schedules = array(
         'hourly' => array( 'interval' => 3600, 'display' => __('Once Hourly') ),
+        'twicedaily' => array( 'interval' => 43200, 'display' => __('Twice Daily') ),
         'daily' => array( 'interval' => 86400, 'display' => __('Once Daily') ),
     );

trunk/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;
@@ -161 +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');
 
 ?>