X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/a349837896628462bf8c9bdc27d1477a10fe03eb..53f4633144ed68c8b8fb5861f992b5489894a940:/wp-includes/update.php diff --git a/wp-includes/update.php b/wp-includes/update.php index ead8e398..c39322ee 100644 --- a/wp-includes/update.php +++ b/wp-includes/update.php @@ -13,20 +13,22 @@ * 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. + * @global string $wp_version Used to check against the newest WordPress version. + * @global wpdb $wpdb + * @global string $wp_local_package * * @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. + * @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. */ function wp_version_check( $extra_stats = array(), $force_check = false ) { - if ( defined('WP_INSTALLING') ) + if ( defined( 'WP_INSTALLING' ) ) { return; + } - global $wpdb, $wp_local_package; - include ABSPATH . WPINC . '/version.php'; // include an unmodified $wp_version + global $wp_version, $wpdb, $wp_local_package; + // include an unmodified $wp_version + include( ABSPATH . WPINC . '/version.php' ); $php_version = phpversion(); $current = get_site_transient( 'update_core' ); @@ -48,10 +50,10 @@ function wp_version_check( $extra_stats = array(), $force_check = false ) { // Wait 60 seconds between multiple version check requests $timeout = 60; $time_not_changed = isset( $current->last_checked ) && $timeout > ( time() - $current->last_checked ); - if ( ! $force_check && $time_not_changed ) - return false; + if ( ! $force_check && $time_not_changed ) { + return; + } - $locale = get_locale(); /** * Filter the locale requested for WordPress core translations. * @@ -59,7 +61,7 @@ function wp_version_check( $extra_stats = array(), $force_check = false ) { * * @param string $locale Current locale. */ - $locale = apply_filters( 'core_version_check_locale', $locale ); + $locale = apply_filters( 'core_version_check_locale', get_locale() ); // Update last_checked for current to prevent multiple blocking requests if request hangs $current->last_checked = time(); @@ -95,7 +97,7 @@ function wp_version_check( $extra_stats = array(), $force_check = false ) { ); $post_body = array( - 'translations' => json_encode( $translations ), + 'translations' => wp_json_encode( $translations ), ); if ( is_array( $extra_stats ) ) @@ -117,18 +119,20 @@ function wp_version_check( $extra_stats = array(), $force_check = false ) { $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 ); } - if ( is_wp_error( $response ) || 200 != wp_remote_retrieve_response_code( $response ) ) - return false; + if ( is_wp_error( $response ) || 200 != wp_remote_retrieve_response_code( $response ) ) { + return; + } $body = trim( wp_remote_retrieve_body( $response ) ); $body = json_decode( $body, true ); - if ( ! is_array( $body ) || ! isset( $body['offers'] ) ) - return false; + if ( ! is_array( $body ) || ! isset( $body['offers'] ) ) { + return; + } $offers = $body['offers']; @@ -143,7 +147,7 @@ function wp_version_check( $extra_stats = array(), $force_check = false ) { $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(); @@ -154,7 +158,20 @@ function wp_version_check( $extra_stats = array(), $force_check = false ) { 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' ); + } } /** @@ -164,18 +181,19 @@ function wp_version_check( $extra_stats = array(), $force_check = false ) { * 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. + * @global string $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() ) { - include ABSPATH . WPINC . '/version.php'; // include an unmodified $wp_version + if ( defined( 'WP_INSTALLING' ) ) { + return; + } - if ( defined('WP_INSTALLING') ) - return false; + global $wp_version; + // include an unmodified $wp_version + include( ABSPATH . WPINC . '/version.php' ); // If running blog-side, bail unless we've not checked in the last 12 hours if ( !function_exists( 'get_plugins' ) ) @@ -205,7 +223,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 ); @@ -229,8 +251,9 @@ function wp_update_plugins( $extra_stats = array() ) { } // Bail if we've checked recently and if nothing has changed - if ( ! $plugin_changed ) - return false; + if ( ! $plugin_changed ) { + return; + } } // Update last_checked for current to prevent multiple blocking requests if request hangs @@ -239,7 +262,6 @@ function wp_update_plugins( $extra_stats = array() ) { $to_send = compact( 'plugins', 'active' ); - $locales = array( get_locale() ); /** * Filter the locales requested for plugin translations. * @@ -247,20 +269,28 @@ function wp_update_plugins( $extra_stats = array() ) { * * @param array $locales Plugin locale. Default is current locale of the site. */ - $locales = apply_filters( 'plugins_update_check_locales', $locales ); + $locales = apply_filters( 'plugins_update_check_locales', array( get_locale() ) ); + + 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'] = json_encode( $extra_stats ); + $options['body']['update_stats'] = wp_json_encode( $extra_stats ); } $url = $http_url = 'http://api.wordpress.org/plugins/update-check/1.1/'; @@ -269,25 +299,33 @@ 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 ); } - if ( is_wp_error( $raw_response ) || 200 != wp_remote_retrieve_response_code( $raw_response ) ) - return false; + if ( is_wp_error( $raw_response ) || 200 != wp_remote_retrieve_response_code( $raw_response ) ) { + return; + } $response = json_decode( wp_remote_retrieve_body( $raw_response ), true ); foreach ( $response['plugins'] as &$plugin ) { $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 ); @@ -300,18 +338,18 @@ 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. * * @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() ) { - include ABSPATH . WPINC . '/version.php'; // include an unmodified $wp_version - - if ( defined( 'WP_INSTALLING' ) ) - return false; + if ( defined( 'WP_INSTALLING' ) ) { + return; + } + global $wp_version; + // include an unmodified $wp_version + include( ABSPATH . WPINC . '/version.php' ); $installed_themes = wp_get_themes(); $translations = wp_get_installed_translations( 'themes' ); @@ -352,7 +390,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 ); @@ -374,8 +416,9 @@ function wp_update_themes( $extra_stats = array() ) { } // Bail if we've checked recently and if nothing has changed - if ( ! $theme_changed ) - return false; + if ( ! $theme_changed ) { + return; + } } // Update last_checked for current to prevent multiple blocking requests if request hangs @@ -384,7 +427,6 @@ function wp_update_themes( $extra_stats = array() ) { $request['themes'] = $themes; - $locales = array( get_locale() ); /** * Filter the locales requested for theme translations. * @@ -392,20 +434,27 @@ function wp_update_themes( $extra_stats = array() ) { * * @param array $locales Theme locale. Default is current locale of the site. */ - $locales = apply_filters( 'themes_update_check_locales', $locales ); + $locales = apply_filters( 'themes_update_check_locales', array( get_locale() ) ); + + 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'] = json_encode( $extra_stats ); + $options['body']['update_stats'] = wp_json_encode( $extra_stats ); } $url = $http_url = 'http://api.wordpress.org/themes/update-check/1.1/'; @@ -414,12 +463,13 @@ 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 ); } - if ( is_wp_error( $raw_response ) || 200 != wp_remote_retrieve_response_code( $raw_response ) ) - return false; + if ( is_wp_error( $raw_response ) || 200 != wp_remote_retrieve_response_code( $raw_response ) ) { + return; + } $new_update = new stdClass; $new_update->last_checked = time(); @@ -441,8 +491,8 @@ function wp_update_themes( $extra_stats = array() ) { * @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,12 +502,13 @@ function wp_maybe_auto_update() { * Retrieves a list of all language updates available. * * @since 3.7.0 + * + * @return array */ function wp_get_translation_updates() { $updates = array(); $transients = array( 'update_core' => 'core', 'update_plugins' => 'plugin', 'update_themes' => 'theme' ); foreach ( $transients as $transient => $type ) { - $transient = get_site_transient( $transient ); if ( empty( $transient->translations ) ) continue; @@ -466,7 +517,6 @@ function wp_get_translation_updates() { $updates[] = (object) $translation; } } - return $updates; } @@ -531,17 +581,20 @@ function wp_get_update_data() { return apply_filters( 'wp_get_update_data', $update_data, $titles ); } +/** + * @global string $wp_version + */ function _maybe_update_core() { - include ABSPATH . WPINC . '/version.php'; // include an unmodified $wp_version + global $wp_version; + include( ABSPATH . WPINC . '/version.php' ); // include an unmodified $wp_version $current = get_site_transient( 'update_core' ); - if ( isset( $current->last_checked ) && + if ( isset( $current->last_checked, $current->version_checked ) && 12 * HOUR_IN_SECONDS > ( time() - $current->last_checked ) && - isset( $current->version_checked ) && - $current->version_checked == $wp_version ) + $current->version_checked == $wp_version ) { return; - + } wp_version_check(); } /** @@ -574,7 +627,6 @@ function _maybe_update_themes() { $current = get_site_transient( 'update_themes' ); if ( isset( $current->last_checked ) && 12 * HOUR_IN_SECONDS > ( time() - $current->last_checked ) ) return; - wp_update_themes(); } @@ -608,8 +660,24 @@ function wp_schedule_update_checks() { } } -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' ); @@ -629,6 +697,8 @@ 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( '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' );