WordPress 3.8.1

[autoinstalls/wordpress.git] / wp-includes / update.php

diff --git a/wp-includes/update.php b/wp-includes/update.php
index bc666fd22508b6bf33e279e7fea49d194a2b0e53..c670f9d0b7aeccf18e650b2827775991e27141f7 100644 (file)
--- a/wp-includes/update.php
+++ b/wp-includes/update.php
@@ -18,9 +18,10 @@
  * @uses $wp_version Used to check against the newest WordPress version.
  *
  * @param array $extra_stats Extra statistics to report to the WordPress.org API.
+ * @param bool $force_check Whether to bypass the transient cache and force a fresh update check. Defaults to false, true if $extra_stats is set.
  * @return mixed Returns null if update is unsupported. Returns false if check is too soon.
  */
-function wp_version_check( $extra_stats = array() ) {
+function wp_version_check( $extra_stats = array(), $force_check = false ) {
        if ( defined('WP_INSTALLING') )
                return;
 
@@ -31,16 +32,23 @@ function wp_version_check( $extra_stats = array() ) {
        $current = get_site_transient( 'update_core' );
        $translations = wp_get_installed_translations( 'core' );
 
+       // Invalidate the transient when $wp_version changes
+       if ( is_object( $current ) && $wp_version != $current->version_checked )
+               $current = false;
+
        if ( ! is_object($current) ) {
                $current = new stdClass;
                $current->updates = array();
                $current->version_checked = $wp_version;
        }
 
+       if ( ! empty( $extra_stats ) )
+               $force_check = true;
+
        // Wait 60 seconds between multiple version check requests
        $timeout = 60;
        $time_not_changed = isset( $current->last_checked ) && $timeout > ( time() - $current->last_checked );
-       if ( $time_not_changed && empty( $extra_stats ) )
+       if ( ! $force_check && $time_not_changed )
                return false;
 
        $locale = get_locale();
@@ -90,7 +98,7 @@ function wp_version_check( $extra_stats = array() ) {
                'translations' => json_encode( $translations ),
        );
 
-       if ( $extra_stats )
+       if ( is_array( $extra_stats ) )
                $post_body = array_merge( $post_body, $extra_stats );
 
        $url = $http_url = 'http://api.wordpress.org/core/version-check/1.7/?' . http_build_query( $query, null, '&' );
@@ -452,7 +460,7 @@ function wp_get_translation_updates() {
        return $updates;
 }
 
-/*
+/**
  * Collect counts and UI strings for available updates
  *
  * @since 3.3.0
@@ -584,6 +592,8 @@ function wp_schedule_update_checks() {
                        $next += 12 * HOUR_IN_SECONDS;
                }
                $next = $next - get_option( 'gmt_offset' ) * HOUR_IN_SECONDS;
+               // Add a random number of minutes, so we don't have all sites trying to update exactly on the hour
+               $next = $next + rand( 0, 59 ) * MINUTE_IN_SECONDS;
                wp_schedule_event( $next, 'twicedaily', 'wp_maybe_auto_update' );
        }
 }