Changes from trunk/src/wp-includes/update.php at r26192 to branches/3.8/src/wp-includes/update.php at r27929

File:

• branches/3.8/src/wp-includes/update.php (modified) (8 diffs)

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

@@ -169 +169 @@
  * @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.
  */
-function wp_update_plugins() {
+function wp_update_plugins( $extra_stats = array() ) {
         include ABSPATH . WPINC . '/version.php'; // include an unmodified $wp_version
 
@@ -210 +211 @@
         $time_not_changed = isset( $current->last_checked ) && $timeout > ( time() - $current->last_checked );
 
-        if ( $time_not_changed ) {
+        if ( $time_not_changed && ! $extra_stats ) {
                 $plugin_changed = false;
                 foreach ( $plugins as $file => $p ) {
@@ -259 +260 @@
         );
 
+        if ( $extra_stats ) {
+                $options['body']['update_stats'] = json_encode( $extra_stats );
+        }
+
         $url = $http_url = 'http://api.wordpress.org/plugins/update-check/1.1/';
         if ( $ssl = wp_http_supports( array( 'ssl' ) ) )
@@ -300 +305 @@
  * @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.
  */
-function wp_update_themes() {
+function wp_update_themes( $extra_stats = array() ) {
         include ABSPATH . WPINC . '/version.php'; // include an unmodified $wp_version
 
@@ -352 +358 @@
         $time_not_changed = isset( $last_update->last_checked ) && $timeout > ( time() - $last_update->last_checked );
 
-        if ( $time_not_changed ) {
+        if ( $time_not_changed && ! $extra_stats ) {
                 $theme_changed = false;
                 foreach ( $checked as $slug => $v ) {
@@ -398 +404 @@
                 'user-agent'    => 'WordPress/' . $wp_version . '; ' . get_bloginfo( 'url' )
         );
+
+        if ( $extra_stats ) {
+                $options['body']['update_stats'] = json_encode( $extra_stats );
+        }
 
         $url = $http_url = 'http://api.wordpress.org/themes/update-check/1.1/';
@@ -611 +621 @@
 add_action( 'admin_init', '_maybe_update_plugins' );
 add_action( 'wp_update_plugins', 'wp_update_plugins' );
-add_action( 'upgrader_process_complete', 'wp_update_plugins' );
+add_action( 'upgrader_process_complete', 'wp_update_plugins', 10, 0 );
 
 add_action( 'load-themes.php', 'wp_update_themes' );
@@ -618 +628 @@
 add_action( 'admin_init', '_maybe_update_themes' );
 add_action( 'wp_update_themes', 'wp_update_themes' );
-add_action( 'upgrader_process_complete', 'wp_update_themes' );
+add_action( 'upgrader_process_complete', 'wp_update_themes', 10, 0 );
 
 add_action( 'wp_maybe_auto_update', 'wp_maybe_auto_update' );