Ticket #27772: 27772.2.diff

src/wp-includes/update.php

@@ -141 +141 @@
                         else
                                 $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' ), '' ) );
         }
 
         $updates = new stdClass();
         $updates->updates = $offers;
         $updates->last_checked = time();
         $updates->version_checked = $wp_version;
 
         if ( isset( $body['translations'] ) )
                 $updates->translations = $body['translations'];
 
-        set_site_transient( 'update_core',  $updates);
+        set_site_transient( 'update_core', $updates );
+
+// Testing only, causes an update cron task to be run every 90seconds
+$body['ttl'] = 90;
+
+        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' );
+        }
 }
 
 /**
  * Check plugin versions against the latest versions hosted on WordPress.org.
  *
  * The WordPress version, PHP version, and Locale is sent along with a list of
  * all plugins installed. Checks against the WordPress server at
  * api.wordpress.org. Will only check if WordPress isn't installing.
  *
  * @since 2.3.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.
  */
@@ -191 +207 @@
         $new_option->last_checked = time();
 
         // Check for update on a different schedule, depending on the page.
         switch ( current_filter() ) {
                 case 'upgrader_process_complete' :
                         $timeout = 0;
                         break;
                 case 'load-update-core.php' :
                         $timeout = MINUTE_IN_SECONDS;
                         break;
                 case 'load-plugins.php' :
                 case 'load-update.php' :
                         $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 );
 
         if ( $time_not_changed && ! $extra_stats ) {
                 $plugin_changed = false;
                 foreach ( $plugins as $file => $p ) {
                         $new_option->checked[ $file ] = $p['Version'];
 
                         if ( !isset( $current->checked[ $file ] ) || strval($current->checked[ $file ]) !== strval($p['Version']) )
                                 $plugin_changed = true;
                 }
 
                 if ( isset ( $current->response ) && is_array( $current->response ) ) {
                         foreach ( $current->response as $plugin_file => $update_details ) {
@@ -337 +357 @@
         }
 
         // Check for update on a different schedule, depending on the page.
         switch ( current_filter() ) {
                 case 'upgrader_process_complete' :
                         $timeout = 0;
                         break;
                 case 'load-update-core.php' :
                         $timeout = MINUTE_IN_SECONDS;
                         break;
                 case 'load-themes.php' :
                 case 'load-update.php' :
                         $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 );
 
         if ( $time_not_changed && ! $extra_stats ) {
                 $theme_changed = false;
                 foreach ( $checked as $slug => $v ) {
                         if ( !isset( $last_update->checked[ $slug ] ) || strval($last_update->checked[ $slug ]) !== strval($v) )
                                 $theme_changed = true;
                 }
 
                 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;