* @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;
$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();
'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, '&' );
* @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.
*/
-function wp_update_plugins( $extra_stats = array() ) {
+function wp_update_plugins() {
include ABSPATH . WPINC . '/version.php'; // include an unmodified $wp_version
if ( defined('WP_INSTALLING') )
$time_not_changed = isset( $current->last_checked ) && $timeout > ( time() - $current->last_checked );
- if ( $time_not_changed && ! $extra_stats ) {
+ if ( $time_not_changed ) {
$plugin_changed = false;
foreach ( $plugins as $file => $p ) {
$new_option->checked[ $file ] = $p['Version'];
'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' );
* @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.
*/
-function wp_update_themes( $extra_stats = array() ) {
+function wp_update_themes() {
include ABSPATH . WPINC . '/version.php'; // include an unmodified $wp_version
if ( defined( 'WP_INSTALLING' ) )
$time_not_changed = isset( $last_update->last_checked ) && $timeout > ( time() - $last_update->last_checked );
- if ( $time_not_changed && ! $extra_stats ) {
+ if ( $time_not_changed ) {
$theme_changed = false;
foreach ( $checked as $slug => $v ) {
if ( !isset( $last_update->checked[ $slug ] ) || strval($last_update->checked[ $slug ]) !== strval($v) )
'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' );
return $updates;
}
-/*
+/**
* Collect counts and UI strings for available updates
*
* @since 3.3.0
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', 10, 0 );
+add_action( 'upgrader_process_complete', 'wp_update_plugins' );
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', 10, 0 );
+add_action( 'upgrader_process_complete', 'wp_update_themes' );
add_action( 'wp_maybe_auto_update', 'wp_maybe_auto_update' );