Changeset 26192

Timestamp:

11/15/2013 03:04:00 AM (13 years ago)

Author:

dd32

Message:

Updates: Force an update check to occur when the 'Check Again' button is used in the Dashboard. Fixes #25831

Location:

trunk/src

Files:

• wp-admin/update-core.php (modified) (2 diffs)
• wp-includes/update.php (modified) (3 diffs)

trunk/src/wp-admin/update-core.php

@@ -484 +484 @@
 
 if ( 'upgrade-core' == $action ) {
-
-        wp_version_check();
+        // Force a update check when requested
+        $force_check = ! empty( $_GET['force-check'] );
+        wp_version_check( array(), $force_check ); 
+
         require_once(ABSPATH . 'wp-admin/admin-header.php');
         ?>
@@ -504 +506 @@
         /* 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>';
 

trunk/src/wp-includes/update.php

@@ -19 +19 @@
  *
  * @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;
@@ -42 +43 @@
         }
 
+        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;
 
@@ -95 +99 @@
         );
 
-        if ( $extra_stats )
+        if ( is_array( $extra_stats ) )
                 $post_body = array_merge( $post_body, $extra_stats );