Ticket #25831: 25831.diff

src/wp-admin/update-core.php

@@ -488 +488 @@
 
 if ( 'upgrade-core' == $action ) {
 
-        wp_version_check();
+        $stats = array();
+        if ( !empty( $_GET['force-check'] ) )
+                $stats['force-check'] = 1;
+        wp_version_check( $stats );
+
         require_once(ABSPATH . 'wp-admin/admin-header.php');
         ?>
         <div class="wrap">
@@ -507 +511 @@
         echo '<p>';
         /* translators: %1 date, %2 time. */
         printf( __('Last checked on %1$s at %2$s.'), date_i18n( get_option( 'date_format' ) ), date_i18n( get_option( 'time_format' ) ) );
-        echo ' &nbsp; <a class="button" href="' . esc_url( self_admin_url('update-core.php') ) . '">' . __( 'Check Again' ) . '</a>';
+        echo ' &nbsp; <a class="button" href="' . esc_url( self_admin_url('update-core.php?force-check=1') ) . '">' . __( 'Check Again' ) . '</a>';
         echo '</p>';
 
         if ( $core = current_user_can( 'update_core' ) )

src/wp-includes/update.php

@@ -31 +31 @@
         $current = get_site_transient( 'update_core' );
         $translations = wp_get_installed_translations( 'core' );
 
+        // Invalidate transient upon $wp_version changes
+        if ( is_object( $current ) && $wp_version != $current->version_checked )
+                $current = false;
+
         if ( ! is_object($current) ) {
                 $current = new stdClass;
                 $current->updates = array();