global $wp_version, $wpdb, $wp_local_package;
$php_version = phpversion();
- $current = get_transient( 'update_core' );
+ $current = get_site_transient( 'update_core' );
if ( ! is_object($current) ) {
$current = new stdClass;
$current->updates = array();
// Update last_checked for current to prevent multiple blocking requests if request hangs
$current->last_checked = time();
- set_transient( 'update_core', $current );
+ set_site_transient( 'update_core', $current );
if ( method_exists( $wpdb, 'db_version' ) )
- $mysql_version = preg_replace('/[^0-9.].*/', '', $wpdb->db_version($wpdb->users));
+ $mysql_version = preg_replace('/[^0-9.].*/', '', $wpdb->db_version());
else
$mysql_version = 'N/A';
+
+ $num_blogs = 1;
+ $wp_install = home_url( '/' );
+ $multisite_enabled = 0;
+ $user_count = count_users( );
+ if ( is_multisite( ) ) {
+ $num_blogs = get_blog_count( );
+ $wp_install = network_site_url( );
+ $multisite_enabled = 1;
+ }
+
$local_package = isset( $wp_local_package )? $wp_local_package : '';
- $url = "http://api.wordpress.org/core/version-check/1.3/?version=$wp_version&php=$php_version&locale=$locale&mysql=$mysql_version&local_package=$local_package";
+ $url = "http://api.wordpress.org/core/version-check/1.5/?version=$wp_version&php=$php_version&locale=$locale&mysql=$mysql_version&local_package=$local_package&blogs=$num_blogs&users={$user_count['total_users']}&multisite_enabled=$multisite_enabled";
$options = array(
- 'timeout' => 3,
- 'user-agent' => 'WordPress/' . $wp_version . '; ' . get_bloginfo( 'url' )
+ 'timeout' => ( ( defined('DOING_CRON') && DOING_CRON ) ? 30 : 3 ),
+ 'user-agent' => 'WordPress/' . $wp_version . '; ' . home_url( '/' ),
+ 'headers' => array(
+ 'wp_install' => $wp_install,
+ 'wp_blog' => home_url( '/' )
+ )
);
$response = wp_remote_get($url, $options);
$body = trim( $response['body'] );
$body = str_replace(array("\r\n", "\r"), "\n", $body);
$new_options = array();
- foreach( explode( "\n\n", $body ) as $entry) {
+ foreach ( explode( "\n\n", $body ) as $entry ) {
$returns = explode("\n", $entry);
$new_option = new stdClass();
$new_option->response = esc_attr( $returns[0] );
$new_option->current = esc_attr( $returns[3] );
if ( isset( $returns[4] ) )
$new_option->locale = esc_attr( $returns[4] );
+ if ( isset( $returns[5] ) )
+ $new_option->php_version = esc_attr( $returns[5] );
+ if ( isset( $returns[6] ) )
+ $new_option->mysql_version = esc_attr( $returns[6] );
$new_options[] = $new_option;
}
$updates->updates = $new_options;
$updates->last_checked = time();
$updates->version_checked = $wp_version;
- set_transient( 'update_core', $updates);
+ set_site_transient( 'update_core', $updates);
}
/**
require_once( ABSPATH . 'wp-admin/includes/plugin.php' );
$plugins = get_plugins();
- $active = get_option( 'active_plugins' );
- $current = get_transient( 'update_plugins' );
+ $active = get_option( 'active_plugins', array() );
+ $current = get_site_transient( 'update_plugins' );
if ( ! is_object($current) )
$current = new stdClass;
// Update last_checked for current to prevent multiple blocking requests if request hangs
$current->last_checked = time();
- set_transient( 'update_plugins', $current );
+ set_site_transient( 'update_plugins', $current );
- $to_send = (object)compact('plugins', 'active');
+ $to_send = (object) compact('plugins', 'active');
$options = array(
- 'timeout' => 3,
+ 'timeout' => ( ( defined('DOING_CRON') && DOING_CRON ) ? 30 : 3),
'body' => array( 'plugins' => serialize( $to_send ) ),
'user-agent' => 'WordPress/' . $wp_version . '; ' . get_bloginfo( 'url' )
);
if ( is_wp_error( $raw_response ) )
return false;
- if( 200 != $raw_response['response']['code'] )
+ if ( 200 != $raw_response['response']['code'] )
return false;
$response = unserialize( $raw_response['body'] );
else
$new_option->response = array();
- set_transient( 'update_plugins', $new_option );
+ set_site_transient( 'update_plugins', $new_option );
}
/**
function wp_update_themes( ) {
global $wp_version;
- if( defined( 'WP_INSTALLING' ) )
+ if ( defined( 'WP_INSTALLING' ) )
return false;
- if( !function_exists( 'get_themes' ) )
+ if ( !function_exists( 'get_themes' ) )
require_once( ABSPATH . 'wp-includes/theme.php' );
$installed_themes = get_themes( );
- $current_theme = get_transient( 'update_themes' );
- if ( ! is_object($current_theme) )
- $current_theme = new stdClass;
+ $last_update = get_site_transient( 'update_themes' );
+ if ( ! is_object($last_update) )
+ $last_update = new stdClass;
- $new_option = new stdClass;
- $new_option->last_checked = time( );
$timeout = 'load-themes.php' == current_filter() ? 3600 : 43200; //Check for updated every 60 minutes if hitting the themes page, Else, check every 12 hours
- $time_not_changed = isset( $current_theme->last_checked ) && $timeout > ( time( ) - $current_theme->last_checked );
+ $time_not_changed = isset( $last_update->last_checked ) && $timeout > ( time( ) - $last_update->last_checked );
- if( $time_not_changed )
- return false;
+ $themes = array();
+ $checked = array();
+ $exclude_fields = array('Template Files', 'Stylesheet Files', 'Status', 'Theme Root', 'Theme Root URI', 'Template Dir', 'Stylesheet Dir', 'Description', 'Tags', 'Screenshot');
- // Update last_checked for current to prevent multiple blocking requests if request hangs
- $current_theme->last_checked = time();
- set_transient( 'update_themes', $current_theme );
+ // Put slug of current theme into request.
+ $themes['current_theme'] = get_option( 'stylesheet' );
+
+ foreach ( (array) $installed_themes as $theme_title => $theme ) {
+ $themes[$theme['Stylesheet']] = array();
+ $checked[$theme['Stylesheet']] = $theme['Version'];
+
+ $themes[$theme['Stylesheet']]['Name'] = $theme['Name'];
+ $themes[$theme['Stylesheet']]['Version'] = $theme['Version'];
+
+ foreach ( (array) $theme as $key => $value ) {
+ if ( !in_array($key, $exclude_fields) )
+ $themes[$theme['Stylesheet']][$key] = $value;
+ }
+ }
- $current_theme->template = get_option( 'template' );
+ $theme_changed = false;
+ foreach ( $checked as $slug => $v ) {
+ $update_request->checked[ $slug ] = $v;
- $themes = array( );
- $themes['current_theme'] = (array) $current_theme;
- foreach( (array) $installed_themes as $theme_title => $theme ) {
- $themes[$theme['Stylesheet']] = array( );
+ if ( !isset( $last_update->checked[ $slug ] ) || strval($last_update->checked[ $slug ]) !== strval($v) )
+ $theme_changed = true;
+ }
- foreach( (array) $theme as $key => $value ) {
- $themes[$theme['Stylesheet']][$key] = $value;
+ if ( isset ( $last_update->response ) && is_array( $last_update->response ) ) {
+ foreach ( $last_update->response as $slug => $update_details ) {
+ if ( ! isset($checked[ $slug ]) ) {
+ $theme_changed = true;
+ break;
+ }
}
}
+ if ( $time_not_changed && !$theme_changed )
+ return false;
+
+ // Update last_checked for current to prevent multiple blocking requests if request hangs
+ $last_update->last_checked = time();
+ set_site_transient( 'update_themes', $last_update );
+
$options = array(
- 'timeout' => 3,
+ 'timeout' => ( ( defined('DOING_CRON') && DOING_CRON ) ? 30 : 3),
'body' => array( 'themes' => serialize( $themes ) ),
'user-agent' => 'WordPress/' . $wp_version . '; ' . get_bloginfo( 'url' )
);
$raw_response = wp_remote_post( 'http://api.wordpress.org/themes/update-check/1.0/', $options );
- if( is_wp_error( $raw_response ) )
+ if ( is_wp_error( $raw_response ) )
return false;
- if( 200 != $raw_response['response']['code'] )
+ if ( 200 != $raw_response['response']['code'] )
return false;
+ $new_update = new stdClass;
+ $new_update->last_checked = time( );
$response = unserialize( $raw_response['body'] );
- if( $response )
- $new_option->response = $response;
+ if ( $response ) {
+ $new_update->checked = $checked;
+ $new_update->response = $response;
+ }
- set_transient( 'update_themes', $new_option );
+ set_site_transient( 'update_themes', $new_update );
}
function _maybe_update_core() {
global $wp_version;
- $current = get_transient( 'update_core' );
+ $current = get_site_transient( 'update_core' );
if ( isset( $current->last_checked ) &&
43200 > ( time() - $current->last_checked ) &&
* @access private
*/
function _maybe_update_plugins() {
- $current = get_transient( 'update_plugins' );
+ $current = get_site_transient( 'update_plugins' );
if ( isset( $current->last_checked ) && 43200 > ( time() - $current->last_checked ) )
return;
wp_update_plugins();
* @access private
*/
function _maybe_update_themes( ) {
- $current = get_transient( 'update_themes' );
- if( isset( $current->last_checked ) && 43200 > ( time( ) - $current->last_checked ) )
+ $current = get_site_transient( 'update_themes' );
+ if ( isset( $current->last_checked ) && 43200 > ( time( ) - $current->last_checked ) )
return;
- wp_update_themes( );
+ wp_update_themes();
}
add_action( 'admin_init', '_maybe_update_core' );
add_action( 'load-plugins.php', 'wp_update_plugins' );
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-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' );
scripts.mit.edu / autoinstalls / wordpress.git / blobdiff