X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/41497a896330304904ef6d5783c724ea713739f6..refs/tags/wordpress-3.7:/wp-admin/includes/update.php diff --git a/wp-admin/includes/update.php b/wp-admin/includes/update.php index e02d4de2..147ce4a1 100644 --- a/wp-admin/includes/update.php +++ b/wp-admin/includes/update.php @@ -6,8 +6,6 @@ * @subpackage Administration */ -// The admin side of our 1.1 update system - /** * Selects the first update version from the update_core option * @@ -15,10 +13,10 @@ */ function get_preferred_from_update_core() { $updates = get_core_updates(); - if ( !is_array( $updates ) ) + if ( ! is_array( $updates ) ) return false; if ( empty( $updates ) ) - return (object)array('response' => 'latest'); + return (object) array( 'response' => 'latest' ); return $updates[0]; } @@ -30,51 +28,129 @@ function get_preferred_from_update_core() { * @return array Array of the update objects */ function get_core_updates( $options = array() ) { - $options = array_merge( array('available' => true, 'dismissed' => false ), $options ); + $options = array_merge( array( 'available' => true, 'dismissed' => false ), $options ); $dismissed = get_site_option( 'dismissed_update_core' ); - if ( !is_array( $dismissed ) ) $dismissed = array(); + + if ( ! is_array( $dismissed ) ) + $dismissed = array(); + $from_api = get_site_transient( 'update_core' ); - if ( empty($from_api) ) + + if ( ! isset( $from_api->updates ) || ! is_array( $from_api->updates ) ) return false; - if ( !isset( $from_api->updates ) || !is_array( $from_api->updates ) ) return false; + $updates = $from_api->updates; - if ( !is_array( $updates ) ) return false; $result = array(); - foreach($updates as $update) { - if ( array_key_exists( $update->current.'|'.$update->locale, $dismissed ) ) { + foreach ( $updates as $update ) { + if ( $update->response == 'autoupdate' ) + continue; + + if ( array_key_exists( $update->current . '|' . $update->locale, $dismissed ) ) { if ( $options['dismissed'] ) { $update->dismissed = true; - $result[]= $update; + $result[] = $update; } } else { if ( $options['available'] ) { $update->dismissed = false; - $result[]= $update; + $result[] = $update; } } } return $result; } +/** + * Gets the best available (and enabled) Auto-Update for WordPress Core. + * + * If there's 1.2.3 and 1.3 on offer, it'll choose 1.3 if the install allows it, else, 1.2.3 + * + * @since 3.7.0 + * + * @return bool|array False on failure, otherwise the core update offering. + */ +function find_core_auto_update() { + $updates = get_site_transient( 'update_core' ); + if ( ! $updates || empty( $updates->updates ) ) + return false; + + include_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php'; + + $auto_update = false; + $upgrader = new WP_Automatic_Updater; + foreach ( $updates->updates as $update ) { + if ( 'autoupdate' != $update->response ) + continue; + + if ( ! $upgrader->should_update( 'core', $update, ABSPATH ) ) + continue; + + if ( ! $auto_update || version_compare( $update->current, $auto_update->current, '>' ) ) + $auto_update = $update; + } + return $auto_update; +} + +/** + * Gets and caches the checksums for the given version of WordPress. + * + * @since 3.7.0 + * + * @param string $version Version string to query. + * @param string $locale Locale to query. + * @return bool|array False on failure. An array of checksums on success. + */ +function get_core_checksums( $version, $locale ) { + $return = array(); + + $url = 'http://api.wordpress.org/core/checksums/1.0/?' . http_build_query( compact( 'version', 'locale' ), null, '&' ); + + if ( wp_http_supports( array( 'ssl' ) ) ) + $url = set_url_scheme( $url, 'https' ); + + $options = array( + 'timeout' => ( ( defined('DOING_CRON') && DOING_CRON ) ? 30 : 3 ), + ); + + $response = wp_remote_get( $url, $options ); + + if ( is_wp_error( $response ) || 200 != wp_remote_retrieve_response_code( $response ) ) + return false; + + $body = trim( wp_remote_retrieve_body( $response ) ); + $body = json_decode( $body, true ); + + if ( ! is_array( $body ) || ! isset( $body['checksums'] ) || ! is_array( $body['checksums'] ) ) + return false; + + return $body['checksums']; +} + function dismiss_core_update( $update ) { $dismissed = get_site_option( 'dismissed_update_core' ); - $dismissed[ $update->current.'|'.$update->locale ] = true; + $dismissed[ $update->current . '|' . $update->locale ] = true; return update_site_option( 'dismissed_update_core', $dismissed ); } function undismiss_core_update( $version, $locale ) { $dismissed = get_site_option( 'dismissed_update_core' ); - $key = $version.'|'.$locale; - if ( !isset( $dismissed[$key] ) ) return false; + $key = $version . '|' . $locale; + + if ( ! isset( $dismissed[$key] ) ) + return false; + unset( $dismissed[$key] ); return update_site_option( 'dismissed_update_core', $dismissed ); } function find_core_update( $version, $locale ) { $from_api = get_site_transient( 'update_core' ); - if ( !is_array( $from_api->updates ) ) return false; + + if ( ! isset( $from_api->updates ) || ! is_array( $from_api->updates ) ) + return false; + $updates = $from_api->updates; - foreach($updates as $update) { + foreach ( $updates as $update ) { if ( $update->current == $version && $update->locale == $locale ) return $update; } @@ -83,9 +159,12 @@ function find_core_update( $version, $locale ) { function core_update_footer( $msg = '' ) { if ( !current_user_can('update_core') ) - return sprintf( __( 'Version %s' ), $GLOBALS['wp_version'] ); + return sprintf( __( 'Version %s' ), get_bloginfo( 'version', 'display' ) ); $cur = get_preferred_from_update_core(); + if ( ! is_object( $cur ) ) + $cur = new stdClass; + if ( ! isset( $cur->current ) ) $cur->current = ''; @@ -97,7 +176,7 @@ function core_update_footer( $msg = '' ) { switch ( $cur->response ) { case 'development' : - return sprintf( __( 'You are using a development version (%1$s). Cool! Please stay updated.' ), $GLOBALS['wp_version'], network_admin_url( 'update-core.php' ) ); + return sprintf( __( 'You are using a development version (%1$s). Cool! Please stay updated.' ), get_bloginfo( 'version', 'display' ), network_admin_url( 'update-core.php' ) ); break; case 'upgrade' : @@ -106,7 +185,7 @@ function core_update_footer( $msg = '' ) { case 'latest' : default : - return sprintf( __( 'Version %s' ), $GLOBALS['wp_version'] ); + return sprintf( __( 'Version %s' ), get_bloginfo( 'version', 'display' ) ); break; } } @@ -134,10 +213,11 @@ function update_nag() { echo "
$msg
"; } add_action( 'admin_notices', 'update_nag', 3 ); +add_action( 'network_admin_notices', 'update_nag', 3 ); // Called directly from dashboard function update_right_now_message() { - $msg = sprintf( __('You are using WordPress %s.'), $GLOBALS['wp_version'] ); + $msg = sprintf( __( 'You are using WordPress %s.' ), get_bloginfo( 'version', 'display' ) ); if ( current_user_can('update_core') ) { $cur = get_preferred_from_update_core(); @@ -207,15 +287,6 @@ function wp_plugin_update_row( $file, $plugin_data ) { } } -function wp_update_plugin($plugin, $feedback = '') { - if ( !empty($feedback) ) - add_filter('update_feedback', $feedback); - - include ABSPATH . 'wp-admin/includes/class-wp-upgrader.php'; - $upgrader = new Plugin_Upgrader(); - return $upgrader->upgrade($plugin); -} - function get_theme_updates() { $themes = wp_get_themes(); $current = get_site_transient('update_themes'); @@ -232,15 +303,6 @@ function get_theme_updates() { return $update_themes; } -function wp_update_theme($theme, $feedback = '') { - if ( !empty($feedback) ) - add_filter('update_feedback', $feedback); - - include ABSPATH . 'wp-admin/includes/class-wp-upgrader.php'; - $upgrader = new Theme_Upgrader(); - return $upgrader->upgrade($theme); -} - function wp_theme_update_rows() { if ( !current_user_can('update_themes' ) ) return; @@ -281,19 +343,28 @@ function wp_theme_update_row( $theme_key, $theme ) { echo ''; } -function wp_update_core($current, $feedback = '') { - if ( !empty($feedback) ) - add_filter('update_feedback', $feedback); - - include ABSPATH . 'wp-admin/includes/class-wp-upgrader.php'; - $upgrader = new Core_Upgrader(); - return $upgrader->upgrade($current); - -} - function maintenance_nag() { + include ABSPATH . WPINC . '/version.php'; // include an unmodified $wp_version global $upgrading; - if ( ! isset( $upgrading ) ) + $nag = isset( $upgrading ); + if ( ! $nag ) { + $failed = get_site_option( 'auto_core_update_failed' ); + /* + * If an update failed critically, we may have copied over version.php but not other files. + * In that case, if the install claims we're running the version we attempted, nag. + * This is serious enough to err on the side of nagging. + * + * If we simply failed to update before we tried to copy any files, then assume things are + * OK if they are now running the latest. + * + * This flag is cleared whenever a successful update occurs using Core_Upgrader. + */ + $comparison = ! empty( $failed['critical'] ) ? '>=' : '>'; + if ( version_compare( $failed['attempted'], $wp_version, '>=' ) ) + $nag = true; + } + + if ( ! $nag ) return false; if ( current_user_can('update_core') ) @@ -304,3 +375,4 @@ function maintenance_nag() { echo "
$msg
"; } add_action( 'admin_notices', 'maintenance_nag' ); +add_action( 'network_admin_notices', 'maintenance_nag' );