Changeset 25750 for trunk/src/wp-includes/update.php

Timestamp:

10/10/2013 01:31:22 AM (11 years ago)

Author:

dd32

Message:

In the event that an Automatic Upgrade fails, send a failure status on the next API request to indicate that it failed, and if the rollback was successful.
See #22704

File:

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

trunk/src/wp-includes/update.php

@@ -18 +18 @@
  * @uses $wp_version Used to check against the newest 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.
  */
-function wp_version_check() {
+function wp_version_check( $extra_stats = array() ) {
     if ( defined('WP_INSTALLING') )
         return;
@@ -40 +41 @@
     $timeout = 60;
     $time_not_changed = isset( $current->last_checked ) && $timeout > ( time() - $current->last_checked );
-    if ( $time_not_changed )
+    if ( $time_not_changed && empty( $extra_args ) )
         return false;
 
@@ -83 +84 @@
         'blogs'             => $num_blogs,
         'users'             => $user_count,
-        'multisite_enabled' => $multisite_enabled
+        'multisite_enabled' => $multisite_enabled,
     );
+
+    if ( $extra_stats )
+        $query = array_merge( $query, $extra_stats );
 
     $url = 'http://api.wordpress.org/core/version-check/1.7/?' . http_build_query( $query, null, '&' );
@@ -543 +547 @@
 add_action( 'admin_init', '_maybe_update_core' );
 add_action( 'wp_version_check', 'wp_version_check' );
-add_action( 'upgrader_process_complete', 'wp_version_check' );
+add_action( 'upgrader_process_complete', 'wp_version_check', 10, 0 );
 
 add_action( 'load-plugins.php', 'wp_update_plugins' );