Changeset 27924 for branches/3.7

Timestamp:

04/03/2014 04:02:35 AM (12 years ago)

Author:

nacin

Message:

Background Updates: Record plugin & theme update statistics like we do for core updates.

Pass plugin/theme update objects into the Background updater for consistency with core & translations.

Merges [27905] to the 3.7 branch.

props dd32.
fixes #27633.

Location:

branches/3.7

Files:

• . (modified) (1 prop)
• src/wp-admin/includes/class-wp-upgrader.php (modified) (6 diffs)
• src/wp-includes/update.php (modified) (6 diffs)

branches/3.7/src/wp-admin/includes/class-wp-upgrader.php

@@ -1873 +1873 @@
                         return false;
 
+                $upgrader_item = $item;
                 switch ( $type ) {
                         case 'core':
@@ -1879 +1880 @@
                                 break;
                         case 'theme':
-                                $theme = wp_get_theme( $item );
+                                $upgrader_item = $item->theme;
+                                $theme = wp_get_theme( $upgrader_item );
                                 $item_name = $theme->Get( 'Name' );
                                 $skin->feedback( __( 'Updating theme: %s' ), $item_name );
                                 break;
                         case 'plugin':
-                                $plugin_data = get_plugin_data( $context . '/' . $item );
+                                $upgrader_item = $item->plugin;
+                                $plugin_data = get_plugin_data( $context . '/' . $upgrader_item );
                                 $item_name = $plugin_data['Name'];
                                 $skin->feedback( __( 'Updating plugin: %s' ), $item_name );
@@ -1896 +1899 @@
 
                 // Boom, This sites about to get a whole new splash of paint!
-                $upgrade_result = $upgrader->upgrade( $item, array(
+                $upgrade_result = $upgrader->upgrade( $upgrader_item, array(
                         'clear_update_cache' => false,
                         'pre_check_md5'      => false, /* always use partial builds if possible for core updates */
@@ -1970 +1973 @@
                 $plugin_updates = get_site_transient( 'update_plugins' );
                 if ( $plugin_updates && !empty( $plugin_updates->response ) ) {
-                        foreach ( array_keys( $plugin_updates->response ) as $plugin ) {
+                        foreach ( $plugin_updates->response as $plugin ) {
                                 $this->update( 'plugin', $plugin );
                         }
@@ -1981 +1984 @@
                 $theme_updates = get_site_transient( 'update_themes' );
                 if ( $theme_updates && !empty( $theme_updates->response ) ) {
-                        foreach ( array_keys( $theme_updates->response ) as $theme ) {
-                                $this->update( 'theme', $theme );
+                        foreach ( $theme_updates->response as $theme ) {
+                                $this->update( 'theme', (object) $theme );
                         }
                         // Force refresh of theme update information
@@ -1997 +2000 @@
                 // Clean up, and check for any pending translations
                 // (Core_Upgrader checks for core updates)
-                wp_update_themes();  // Check for Theme updates
-                wp_update_plugins(); // Check for Plugin updates
+                $theme_stats = array();
+                if ( isset( $this->update_results['theme'] ) ) {
+                        foreach ( $this->update_results['theme'] as $upgrade ) {
+                                $theme_stats[ $upgrade->item->theme ] = ( true === $upgrade->result );
+                        }
+                }
+                wp_update_themes( $theme_stats );  // Check for Theme updates
+
+                $plugin_stats = array();
+                if ( isset( $this->update_results['plugin'] ) ) {
+                        foreach ( $this->update_results['plugin'] as $upgrade ) {
+                                $plugin_stats[ $upgrade->item->plugin ] = ( true === $upgrade->result );
+                        }
+                }
+                wp_update_plugins( $plugin_stats ); // Check for Plugin updates
 
                 // Finally, Process any new translations

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

@@ -161 +161 @@
  * @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
 
@@ -202 +203 @@
         $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 ) {
@@ -251 +252 @@
         );
 
+        if ( $plugin_update_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' ) ) )
@@ -292 +297 @@
  * @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
 
@@ -344 +350 @@
         $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 ) {
@@ -390 +396 @@
                 'user-agent'    => 'WordPress/' . $wp_version . '; ' . get_bloginfo( 'url' )
         );
+
+        if ( $theme_update_stats ) {
+                $options['body']['update_stats'] = json_encode( $extra_stats );
+        }
 
         $url = $http_url = 'http://api.wordpress.org/themes/update-check/1.1/';