WordPress 3.8.2

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

diff --git a/wp-includes/update.php b/wp-includes/update.php
index bc666fd22508b6bf33e279e7fea49d194a2b0e53..ead8e39885afab86f5c538147e368614e29d41f3 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.
  * @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.
  */
  * @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;
 
        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' );
 
        $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 ( ! 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 );
        // 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();
                return false;
 
        $locale = get_locale();


@@ -90,7 +98,7 @@ function wp_version_check( $extra_stats = array() ) {
                'translations' => json_encode( $translations ),
        );
 
                '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, '&' );
                $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, '&' );


@@ -160,9 +168,10 @@ function wp_version_check( $extra_stats = array() ) {
  * @since 2.3.0
  * @uses $wp_version Used to notify the WordPress version.
  *
  * @since 2.3.0
  * @uses $wp_version Used to notify the WordPress version.
  *

+ * @param array $extra_stats Extra statistics to report to the WordPress.org API.

  * @return mixed Returns null if update is unsupported. Returns false if check is too soon.
  */
  * @return mixed Returns null if update is unsupported. Returns false if check is too soon.
  */

-function wp_update_plugins() {
+function wp_update_plugins( $extra_stats = array() ) {

        include ABSPATH . WPINC . '/version.php'; // include an unmodified $wp_version
 
        if ( defined('WP_INSTALLING') )
        include ABSPATH . WPINC . '/version.php'; // include an unmodified $wp_version
 
        if ( defined('WP_INSTALLING') )


@@ -201,7 +210,7 @@ function wp_update_plugins() {
 
        $time_not_changed = isset( $current->last_checked ) && $timeout > ( time() - $current->last_checked );
 
 
        $time_not_changed = isset( $current->last_checked ) && $timeout > ( time() - $current->last_checked );
 

-       if ( $time_not_changed ) {
+       if ( $time_not_changed && ! $extra_stats ) {

                $plugin_changed = false;
                foreach ( $plugins as $file => $p ) {
                        $new_option->checked[ $file ] = $p['Version'];
                $plugin_changed = false;
                foreach ( $plugins as $file => $p ) {
                        $new_option->checked[ $file ] = $p['Version'];


@@ -250,6 +259,10 @@ function wp_update_plugins() {
                'user-agent' => 'WordPress/' . $wp_version . '; ' . get_bloginfo( 'url' )
        );
 
                'user-agent' => 'WordPress/' . $wp_version . '; ' . get_bloginfo( 'url' )
        );
 

+       if ( $extra_stats ) {
+               $options['body']['update_stats'] = json_encode( $extra_stats );
+       }
+

        $url = $http_url = 'http://api.wordpress.org/plugins/update-check/1.1/';
        if ( $ssl = wp_http_supports( array( 'ssl' ) ) )
                $url = set_url_scheme( $url, 'https' );
        $url = $http_url = 'http://api.wordpress.org/plugins/update-check/1.1/';
        if ( $ssl = wp_http_supports( array( 'ssl' ) ) )
                $url = set_url_scheme( $url, 'https' );


@@ -291,9 +304,10 @@ function wp_update_plugins() {
  * @since 2.7.0
  * @uses $wp_version Used to notify the WordPress version.
  *
  * @since 2.7.0
  * @uses $wp_version Used to notify the WordPress version.
  *

+ * @param array $extra_stats Extra statistics to report to the WordPress.org API.

  * @return mixed Returns null if update is unsupported. Returns false if check is too soon.
  */
  * @return mixed Returns null if update is unsupported. Returns false if check is too soon.
  */

-function wp_update_themes() {
+function wp_update_themes( $extra_stats = array() ) {

        include ABSPATH . WPINC . '/version.php'; // include an unmodified $wp_version
 
        if ( defined( 'WP_INSTALLING' ) )
        include ABSPATH . WPINC . '/version.php'; // include an unmodified $wp_version
 
        if ( defined( 'WP_INSTALLING' ) )


@@ -343,7 +357,7 @@ function wp_update_themes() {
 
        $time_not_changed = isset( $last_update->last_checked ) && $timeout > ( time() - $last_update->last_checked );
 
 
        $time_not_changed = isset( $last_update->last_checked ) && $timeout > ( time() - $last_update->last_checked );
 

-       if ( $time_not_changed ) {
+       if ( $time_not_changed && ! $extra_stats ) {

                $theme_changed = false;
                foreach ( $checked as $slug => $v ) {
                        if ( !isset( $last_update->checked[ $slug ] ) || strval($last_update->checked[ $slug ]) !== strval($v) )
                $theme_changed = false;
                foreach ( $checked as $slug => $v ) {
                        if ( !isset( $last_update->checked[ $slug ] ) || strval($last_update->checked[ $slug ]) !== strval($v) )


@@ -390,6 +404,10 @@ function wp_update_themes() {
                'user-agent'    => 'WordPress/' . $wp_version . '; ' . get_bloginfo( 'url' )
        );
 
                'user-agent'    => 'WordPress/' . $wp_version . '; ' . get_bloginfo( 'url' )
        );
 

+       if ( $extra_stats ) {
+               $options['body']['update_stats'] = json_encode( $extra_stats );
+       }
+

        $url = $http_url = 'http://api.wordpress.org/themes/update-check/1.1/';
        if ( $ssl = wp_http_supports( array( 'ssl' ) ) )
                $url = set_url_scheme( $url, 'https' );
        $url = $http_url = 'http://api.wordpress.org/themes/update-check/1.1/';
        if ( $ssl = wp_http_supports( array( 'ssl' ) ) )
                $url = set_url_scheme( $url, 'https' );


@@ -452,7 +470,7 @@ function wp_get_translation_updates() {
        return $updates;
 }
 
        return $updates;
 }
 

-/*
+/**

  * Collect counts and UI strings for available updates
  *
  * @since 3.3.0
  * Collect counts and UI strings for available updates
  *
  * @since 3.3.0


@@ -584,6 +602,8 @@ function wp_schedule_update_checks() {
                        $next += 12 * HOUR_IN_SECONDS;
                }
                $next = $next - get_option( 'gmt_offset' ) * HOUR_IN_SECONDS;
                        $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' );
        }
 }
                wp_schedule_event( $next, 'twicedaily', 'wp_maybe_auto_update' );
        }
 }


@@ -600,14 +620,14 @@ add_action( 'load-update.php', 'wp_update_plugins' );
 add_action( 'load-update-core.php', 'wp_update_plugins' );
 add_action( 'admin_init', '_maybe_update_plugins' );
 add_action( 'wp_update_plugins', 'wp_update_plugins' );
 add_action( 'load-update-core.php', 'wp_update_plugins' );
 add_action( 'admin_init', '_maybe_update_plugins' );
 add_action( 'wp_update_plugins', 'wp_update_plugins' );

-add_action( 'upgrader_process_complete', 'wp_update_plugins' );
+add_action( 'upgrader_process_complete', 'wp_update_plugins', 10, 0 );

 
 add_action( 'load-themes.php', 'wp_update_themes' );
 add_action( 'load-update.php', 'wp_update_themes' );
 add_action( 'load-update-core.php', 'wp_update_themes' );
 add_action( 'admin_init', '_maybe_update_themes' );
 add_action( 'wp_update_themes', 'wp_update_themes' );
 
 add_action( 'load-themes.php', 'wp_update_themes' );
 add_action( 'load-update.php', 'wp_update_themes' );
 add_action( 'load-update-core.php', 'wp_update_themes' );
 add_action( 'admin_init', '_maybe_update_themes' );
 add_action( 'wp_update_themes', 'wp_update_themes' );

-add_action( 'upgrader_process_complete', 'wp_update_themes' );
+add_action( 'upgrader_process_complete', 'wp_update_themes', 10, 0 );

 
 add_action( 'wp_maybe_auto_update', 'wp_maybe_auto_update' );
 
 
 add_action( 'wp_maybe_auto_update', 'wp_maybe_auto_update' );