Ticket #25833: 25833.diff

src/wp-admin/includes/upgrade.php

@@ -405 +405 @@
         if ( $wp_current_db_version < 25824 )
                 upgrade_370();
 
+        if ( $wp_current_db_version < 25825 )
+                upgrade_372();
+
         maybe_disable_link_manager();
 
         maybe_disable_automattic_widgets();
@@ -1223 +1226 @@
 }
 
 /**
+ * Execute changes made in WordPress 3.7.2.
+ *
+ * @since 3.7.2
+ */
+function upgrade_372() {
+        global $wp_current_db_version;
+        if ( $wp_current_db_version < 25825 )
+                wp_clear_scheduled_hook( 'wp_maybe_auto_update' );
+}
+
+/**
  * Execute network level changes
  *
  * @since 3.0.0

src/wp-includes/update.php

@@ -577 +577 @@
 
         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' );
+                // Add a random number of minutes, so we don't have all sites trying to update exactly on the hour
+                $next = strtotime( 'today 7am' ) + rand( 0, 59 ) * MINUTE_IN_SECONDS;
                 $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 ) {

src/wp-includes/version.php

@@ -11 +11 @@
  *
  * @global int $wp_db_version
  */
-$wp_db_version = 25824;
+$wp_db_version = 25825;
 
 /**
  * Holds the TinyMCE version