Changeset 36184 for branches/3.8

Timestamp:

01/06/2016 12:23:15 PM (9 years ago)

Author:

dd32

Message:

Background Updates: Remove the 7am/7pm background update check.

This changeset is a more basic version of [36180], clearing the extra now redundant schedule.
As the functionality for this was introduced in 3.9, [28129] has been backported to 3.7/3.8, allowing the API TTL to be respected by those versions.

See #27772.
Fixes #35323.

Location:

branches/3.8

Files:

• . (modified) (1 prop)
• src/wp-includes/update.php (modified) (4 diffs)

branches/3.8/src/wp-includes/update.php

@@ -155 +155 @@
         $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 background updates if running non-interactively, and we weren't called from the update handler.
+    if ( defined( 'DOING_CRON' ) && DOING_CRON && 'wp_maybe_auto_update' != current_filter() ) {
+        do_action( 'wp_maybe_auto_update' );
+    }
 }
 
@@ -206 +219 @@
             break;
         default :
-            $timeout = 12 * HOUR_IN_SECONDS;
+            if ( defined( 'DOING_CRON' ) && DOING_CRON ) {
+                $timeout = 0;
+            } else {
+                $timeout = 12 * HOUR_IN_SECONDS;
+            }
     }
 
@@ -353 +370 @@
             break;
         default :
-            $timeout = 12 * HOUR_IN_SECONDS;
+            if ( defined( 'DOING_CRON' ) && DOING_CRON ) {
+                $timeout = 0;
+            } else {
+                $timeout = 12 * HOUR_IN_SECONDS;
+            }
     }
 
@@ -594 +615 @@
         wp_schedule_event(time(), 'twicedaily', 'wp_update_themes');
 
-    if ( ! wp_next_scheduled( 'wp_maybe_auto_update' ) && ! defined( 'WP_INSTALLING' ) ) {
-        // Schedule auto updates for 7 a.m. and 7 p.m. in the timezone of the site.
-        $next = strtotime( 'today 7am' );
-        $now = time();
-        // Find the next instance of 7 a.m. or 7 p.m., but skip it if it is within 3 hours from now.
-        while ( ( $now + 3 * HOUR_IN_SECONDS ) > $next ) {
-            $next += 12 * HOUR_IN_SECONDS;
-        }
-        $next = $next - get_option( 'gmt_offset' ) * HOUR_IN_SECONDS;
-        // Add a random number of minutes, so we don't have all sites trying to update exactly on the hour
-        $next = $next + rand( 0, 59 ) * MINUTE_IN_SECONDS;
-        wp_schedule_event( $next, 'twicedaily', 'wp_maybe_auto_update' );
-    }
+    if ( ( wp_next_scheduled( 'wp_maybe_auto_update' ) > ( time() + HOUR_IN_SECONDS ) ) && ! defined('WP_INSTALLING') )
+        wp_clear_scheduled_hook( 'wp_maybe_auto_update' );
 }