--- a/wp/wp-includes/update.php Mon Jun 08 16:11:51 2015 +0000
+++ b/wp/wp-includes/update.php Tue Jun 09 03:35:32 2015 +0200
@@ -13,34 +13,41 @@
* 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.
- * @return mixed Returns null if update is unsupported. Returns false if check is too soon.
+ * @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 null|false 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;
global $wpdb, $wp_local_package;
- include ABSPATH . WPINC . '/version.php'; // include an unmodified $wp_version
+ include( ABSPATH . WPINC . '/version.php' ); // include an unmodified $wp_version
$php_version = phpversion();
$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();
@@ -87,10 +94,10 @@
);
$post_body = array(
- 'translations' => json_encode( $translations ),
+ 'translations' => wp_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 @@
$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 <a href="http://wordpress.org/support/">support forums</a>.' ) . ' ' . '(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 <a href="https://wordpress.org/support/">support forums</a>.' ) . ' ' . __( '(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 @@
$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', 'new_files' ), '' ) );
}
$updates = new stdClass();
@@ -146,7 +153,20 @@
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,14 +176,14 @@
* 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.
*
- * @return mixed Returns null if update is unsupported. Returns false if check is too soon.
+ * @param array $extra_stats Extra statistics to report to the WordPress.org API.
+ * @return false|null Returns null if update is unsupported. Returns false if check is too soon.
*/
-function wp_update_plugins() {
- include ABSPATH . WPINC . '/version.php'; // include an unmodified $wp_version
+function wp_update_plugins( $extra_stats = array() ) {
+ include( ABSPATH . WPINC . '/version.php' ); // include an unmodified $wp_version
if ( defined('WP_INSTALLING') )
return false;
@@ -196,12 +216,16 @@
$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 );
- if ( $time_not_changed ) {
+ if ( $time_not_changed && ! $extra_stats ) {
$plugin_changed = false;
foreach ( $plugins as $file => $p ) {
$new_option->checked[ $file ] = $p['Version'];
@@ -240,23 +264,35 @@
*/
$locales = apply_filters( 'plugins_update_check_locales', $locales );
+ if ( defined( 'DOING_CRON' ) && DOING_CRON ) {
+ $timeout = 30;
+ } else {
+ // Three seconds, plus one extra second for every 10 plugins
+ $timeout = 3 + (int) ( count( $plugins ) / 10 );
+ }
+
$options = array(
- 'timeout' => ( ( defined('DOING_CRON') && DOING_CRON ) ? 30 : 3),
+ 'timeout' => $timeout,
'body' => array(
- 'plugins' => json_encode( $to_send ),
- 'translations' => json_encode( $translations ),
- 'locale' => json_encode( $locales ),
+ 'plugins' => wp_json_encode( $to_send ),
+ 'translations' => wp_json_encode( $translations ),
+ 'locale' => wp_json_encode( $locales ),
+ 'all' => wp_json_encode( true ),
),
'user-agent' => 'WordPress/' . $wp_version . '; ' . get_bloginfo( 'url' )
);
+ if ( $extra_stats ) {
+ $options['body']['update_stats'] = wp_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' );
$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 <a href="http://wordpress.org/support/">support forums</a>.' ) . ' ' . '(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 <a href="https://wordpress.org/support/">support forums</a>.' ) . ' ' . __( '(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 );
}
@@ -268,13 +304,20 @@
$plugin = (object) $plugin;
}
unset( $plugin );
+ foreach ( $response['no_update'] as &$plugin ) {
+ $plugin = (object) $plugin;
+ }
+ unset( $plugin );
if ( is_array( $response ) ) {
$new_option->response = $response['plugins'];
$new_option->translations = $response['translations'];
+ // TODO: Perhaps better to store no_update in a separate transient with an expiry?
+ $new_option->no_update = $response['no_update'];
} else {
$new_option->response = array();
$new_option->translations = array();
+ $new_option->no_update = array();
}
set_site_transient( 'update_plugins', $new_option );
@@ -287,14 +330,14 @@
* 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.
*
- * @return mixed Returns null if update is unsupported. Returns false if check is too soon.
+ * @param array $extra_stats Extra statistics to report to the WordPress.org API.
+ * @return false|null Returns null if update is unsupported. Returns false if check is too soon.
*/
-function wp_update_themes() {
- include ABSPATH . WPINC . '/version.php'; // include an unmodified $wp_version
+function wp_update_themes( $extra_stats = array() ) {
+ include( ABSPATH . WPINC . '/version.php' ); // include an unmodified $wp_version
if ( defined( 'WP_INSTALLING' ) )
return false;
@@ -338,12 +381,16 @@
$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 );
- 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) )
@@ -380,23 +427,34 @@
*/
$locales = apply_filters( 'themes_update_check_locales', $locales );
+ if ( defined( 'DOING_CRON' ) && DOING_CRON ) {
+ $timeout = 30;
+ } else {
+ // Three seconds, plus one extra second for every 10 themes
+ $timeout = 3 + (int) ( count( $themes ) / 10 );
+ }
+
$options = array(
- 'timeout' => ( ( defined('DOING_CRON') && DOING_CRON ) ? 30 : 3),
+ 'timeout' => $timeout,
'body' => array(
- 'themes' => json_encode( $request ),
- 'translations' => json_encode( $translations ),
- 'locale' => json_encode( $locales ),
+ 'themes' => wp_json_encode( $request ),
+ 'translations' => wp_json_encode( $translations ),
+ 'locale' => wp_json_encode( $locales ),
),
'user-agent' => 'WordPress/' . $wp_version . '; ' . get_bloginfo( 'url' )
);
+ if ( $extra_stats ) {
+ $options['body']['update_stats'] = wp_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' );
$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 <a href="http://wordpress.org/support/">support forums</a>.' ) . ' ' . '(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 <a href="https://wordpress.org/support/">support forums</a>.' ) . ' ' . __( '(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 );
}
@@ -423,8 +481,8 @@
* @since 3.7.0
*/
function wp_maybe_auto_update() {
- include_once ABSPATH . '/wp-admin/includes/admin.php';
- include_once ABSPATH . '/wp-admin/includes/class-wp-upgrader.php';
+ include_once( ABSPATH . '/wp-admin/includes/admin.php' );
+ include_once( ABSPATH . '/wp-admin/includes/class-wp-upgrader.php' );
$upgrader = new WP_Automatic_Updater;
$upgrader->run();
@@ -452,7 +510,7 @@
return $updates;
}
-/*
+/**
* Collect counts and UI strings for available updates
*
* @since 3.3.0
@@ -514,7 +572,7 @@
}
function _maybe_update_core() {
- include ABSPATH . WPINC . '/version.php'; // include an unmodified $wp_version
+ include( ABSPATH . WPINC . '/version.php' ); // include an unmodified $wp_version
$current = get_site_transient( 'update_core' );
@@ -584,12 +642,30 @@
$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' );
}
}
-if ( ( ! is_main_site() && ! is_network_admin() ) || ( defined( 'DOING_AJAX' ) && DOING_AJAX ) )
+/**
+ * Clear existing update caches for plugins, themes, and core.
+ *
+ * @since 4.1.0
+ */
+function wp_clean_update_cache() {
+ if ( function_exists( 'wp_clean_plugins_cache' ) ) {
+ wp_clean_plugins_cache();
+ } else {
+ delete_site_transient( 'update_plugins' );
+ }
+ wp_clean_themes_cache();
+ delete_site_transient( 'update_core' );
+}
+
+if ( ( ! is_main_site() && ! is_network_admin() ) || ( defined( 'DOING_AJAX' ) && DOING_AJAX ) ) {
return;
+}
add_action( 'admin_init', '_maybe_update_core' );
add_action( 'wp_version_check', 'wp_version_check' );
@@ -600,15 +676,17 @@
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( 'upgrader_process_complete', 'wp_update_themes' );
+add_action( 'upgrader_process_complete', 'wp_update_themes', 10, 0 );
+
+add_action( 'update_option_WPLANG', 'wp_clean_update_cache' , 10, 0 );
add_action( 'wp_maybe_auto_update', 'wp_maybe_auto_update' );
-add_action('init', 'wp_schedule_update_checks');
+add_action( 'init', 'wp_schedule_update_checks' );