X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/c55863f11e8589bf8d4a5698bf15752406654f1c..245e789b234afa4525862e7a6e5e3c2e7a52ef20:/wp-includes/update.php
diff --git a/wp-includes/update.php b/wp-includes/update.php
index de335a04..3639907b 100644
--- a/wp-includes/update.php
+++ b/wp-includes/update.php
@@ -13,14 +13,14 @@
* WordPress server at api.wordpress.org server. Will only check if WordPress
* isn't installing.
*
- * @package WordPress
* @since 2.3.0
* @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 +31,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 +97,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, '&' );
@@ -109,7 +116,7 @@ function wp_version_check( $extra_stats = array() ) {
$response = wp_remote_post( $url, $options );
if ( $ssl && is_wp_error( $response ) ) {
- trigger_error( __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server’s configuration. If you continue to have problems, please try the support forums.' ) . ' ' . '(WordPress could not establish a secure connection to WordPress.org. Please contact your server administrator.)', headers_sent() || WP_DEBUG ? E_USER_WARNING : E_USER_NOTICE );
+ trigger_error( __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server’s configuration. If you continue to have problems, please try the support forums.' ) . ' ' . __( '(WordPress could not establish a secure connection to WordPress.org. Please contact your server administrator.)' ), headers_sent() || WP_DEBUG ? E_USER_WARNING : E_USER_NOTICE );
$response = wp_remote_post( $http_url, $options );
}
@@ -135,7 +142,7 @@ function wp_version_check( $extra_stats = array() ) {
$offer[ $offer_key ] = esc_html( $value );
}
$offer = (object) array_intersect_key( $offer, array_fill_keys( array( 'response', 'download', 'locale',
- 'packages', 'current', 'version', 'php_version', 'mysql_version', 'new_bundled', 'partial_version', 'notify_email' ), '' ) );
+ 'packages', 'current', 'version', 'php_version', 'mysql_version', 'new_bundled', 'partial_version', 'notify_email', 'support_email' ), '' ) );
}
$updates = new stdClass();
@@ -146,7 +153,20 @@ function wp_version_check( $extra_stats = array() ) {
if ( isset( $body['translations'] ) )
$updates->translations = $body['translations'];
- set_site_transient( 'update_core', $updates);
+ set_site_transient( 'update_core', $updates );
+
+ if ( ! empty( $body['ttl'] ) ) {
+ $ttl = (int) $body['ttl'];
+ if ( $ttl && ( time() + $ttl < wp_next_scheduled( 'wp_version_check' ) ) ) {
+ // Queue an event to re-run the update check in $ttl seconds.
+ wp_schedule_single_event( time() + $ttl, 'wp_version_check' );
+ }
+ }
+
+ // Trigger a background updates check if running non-interactively, and we weren't called from the update handler.
+ if ( defined( 'DOING_CRON' ) && DOING_CRON && ! doing_action( 'wp_maybe_auto_update' ) ) {
+ do_action( 'wp_maybe_auto_update' );
+ }
}
/**
@@ -156,7 +176,6 @@ function wp_version_check( $extra_stats = array() ) {
* all plugins installed. Checks against the WordPress server at
* api.wordpress.org. Will only check if WordPress isn't installing.
*
- * @package WordPress
* @since 2.3.0
* @uses $wp_version Used to notify the WordPress version.
*
@@ -197,7 +216,11 @@ function wp_update_plugins( $extra_stats = array() ) {
$timeout = HOUR_IN_SECONDS;
break;
default :
- $timeout = 12 * HOUR_IN_SECONDS;
+ if ( defined( 'DOING_CRON' ) && DOING_CRON ) {
+ $timeout = 0;
+ } else {
+ $timeout = 12 * HOUR_IN_SECONDS;
+ }
}
$time_not_changed = isset( $current->last_checked ) && $timeout > ( time() - $current->last_checked );
@@ -261,7 +284,7 @@ function wp_update_plugins( $extra_stats = array() ) {
$raw_response = wp_remote_post( $url, $options );
if ( $ssl && is_wp_error( $raw_response ) ) {
- trigger_error( __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server’s configuration. If you continue to have problems, please try the support forums.' ) . ' ' . '(WordPress could not establish a secure connection to WordPress.org. Please contact your server administrator.)', headers_sent() || WP_DEBUG ? E_USER_WARNING : E_USER_NOTICE );
+ trigger_error( __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server’s configuration. If you continue to have problems, please try the support forums.' ) . ' ' . __( '(WordPress could not establish a secure connection to WordPress.org. Please contact your server administrator.)' ), headers_sent() || WP_DEBUG ? E_USER_WARNING : E_USER_NOTICE );
$raw_response = wp_remote_post( $http_url, $options );
}
@@ -292,7 +315,6 @@ function wp_update_plugins( $extra_stats = array() ) {
* WordPress server at api.wordpress.org. Will only check if WordPress isn't
* installing.
*
- * @package WordPress
* @since 2.7.0
* @uses $wp_version Used to notify the WordPress version.
*
@@ -344,7 +366,11 @@ function wp_update_themes( $extra_stats = array() ) {
$timeout = HOUR_IN_SECONDS;
break;
default :
- $timeout = 12 * HOUR_IN_SECONDS;
+ if ( defined( 'DOING_CRON' ) && DOING_CRON ) {
+ $timeout = 0;
+ } else {
+ $timeout = 12 * HOUR_IN_SECONDS;
+ }
}
$time_not_changed = isset( $last_update->last_checked ) && $timeout > ( time() - $last_update->last_checked );
@@ -406,7 +432,7 @@ function wp_update_themes( $extra_stats = array() ) {
$raw_response = wp_remote_post( $url, $options );
if ( $ssl && is_wp_error( $raw_response ) ) {
- trigger_error( __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server’s configuration. If you continue to have problems, please try the support forums.' ) . ' ' . '(WordPress could not establish a secure connection to WordPress.org. Please contact your server administrator.)', headers_sent() || WP_DEBUG ? E_USER_WARNING : E_USER_NOTICE );
+ trigger_error( __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server’s configuration. If you continue to have problems, please try the support forums.' ) . ' ' . __( '(WordPress could not establish a secure connection to WordPress.org. Please contact your server administrator.)' ), headers_sent() || WP_DEBUG ? E_USER_WARNING : E_USER_NOTICE );
$raw_response = wp_remote_post( $http_url, $options );
}
@@ -462,7 +488,7 @@ function wp_get_translation_updates() {
return $updates;
}
-/*
+/**
* Collect counts and UI strings for available updates
*
* @since 3.3.0