Ticket #35323: 35323.diff

src/wp-includes/update.php

@@ -635 +641 @@
 
 /**
  * Schedule core, theme, and plugin update checks.
  *
  * @since 3.1.0
  */
 function wp_schedule_update_checks() {
         if ( ! wp_next_scheduled( 'wp_version_check' ) && ! wp_installing() )
                 wp_schedule_event(time(), 'twicedaily', 'wp_version_check');
 
         if ( ! wp_next_scheduled( 'wp_update_plugins' ) && ! wp_installing() )
                 wp_schedule_event(time(), 'twicedaily', 'wp_update_plugins');
 
         if ( ! wp_next_scheduled( 'wp_update_themes' ) && ! wp_installing() )
                 wp_schedule_event(time(), 'twicedaily', 'wp_update_themes');
-
-        if ( ! wp_next_scheduled( 'wp_maybe_auto_update' ) && ! 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' );
-        }
 }
 
 /**
  * Clear existing update caches for plugins, themes, and core.
  *
  * @since 4.1.0
  */
 function wp_clean_update_cache() {
         if ( function_exists( 'wp_clean_plugins_cache' ) ) {
                 wp_clean_plugins_cache();
         } else {
                 delete_site_transient( 'update_plugins' );
         }
         wp_clean_themes_cache();
         delete_site_transient( 'update_core' );

src/wp-admin/includes/upgrade.php

@@ -537 +537 @@
         if ( $wp_current_db_version < 26691 )
                 upgrade_380();
 
         if ( $wp_current_db_version < 29630 )
                 upgrade_400();
 
         if ( $wp_current_db_version < 33055 )
                 upgrade_430();
 
         if ( $wp_current_db_version < 33056 )
                 upgrade_431();
 
         if ( $wp_current_db_version < 35700 )
                 upgrade_440();
 
+        if ( $wp_current_db_version < 35701 )
+                upgrade_450();
+
         maybe_disable_link_manager();
 
         maybe_disable_automattic_widgets();
 
         update_option( 'db_version', $wp_db_version );
         update_option( 'db_upgraded', true );
 }
 
 /**
  * Execute changes made in WordPress 1.0.
  *
  * @ignore
  * @since 1.0.0
  *
  * @global wpdb $wpdb WordPress database abstraction object.
@@ -1648 +1651 @@
 
         if ( $wp_current_db_version < 34030 ) {
                 $wpdb->query( "ALTER TABLE {$wpdb->options} MODIFY option_name VARCHAR(191)" );
         }
 
         // Remove the unused 'add_users' role.
         $roles = wp_roles();
         foreach ( $roles->role_objects as $role ) {
                 if ( $role->has_cap( 'add_users' ) ) {
                         $role->remove_cap( 'add_users' );
                 }
         }
 }
 
 /**
+ * Execute changes made in WordPress 4.5.0
+ *
+ * @ignore
+ * @since 4.5.0
+ *
+ * @global int $wp_current_db_version
+ */
+function upgrade_450() {
+        global $wp_current_db_version;
+        if ( $wp_current_db_version < 35701 )
+                wp_clear_scheduled_hook( 'wp_maybe_auto_update' );
+}
+
+/**
  * Executes network-level upgrade routines.
  *
  * @since 3.0.0
  *
  * @global int   $wp_current_db_version
  * @global wpdb  $wpdb
  */
 function upgrade_network() {
         global $wp_current_db_version, $wpdb;
 
         // Always.
         if ( is_main_network() ) {
                 /*
                  * Deletes all expired transients. The multi-table delete syntax is used
                  * to delete the transient record from table a, and the corresponding

src/wp-includes/version.php

@@ -1 +1 @@
 <?php
 /**
  * The WordPress version string
  *
  * @global string $wp_version
  */
 $wp_version = '4.5-alpha-35776-src';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
  *
  * @global int $wp_db_version
  */
-$wp_db_version = 35700;
+$wp_db_version = 35701;
 
 /**
  * Holds the TinyMCE version
  *
  * @global string $tinymce_version
  */
 $tinymce_version = '4208-20151113';
 
 /**
  * Holds the required PHP version
  *
  * @global string $required_php_version
  */
 $required_php_version = '5.2.4';