Changeset 25781

Timestamp:

10/14/2013 11:32:47 PM (12 years ago)

Author:

nacin

Message:

Automatic updates: Include error data in the follow-up API request.

props dd32.
see #22704.

Location:

trunk/src

Files:

• wp-admin/includes/class-wp-upgrader.php (modified) (1 diff)
• wp-includes/update.php (modified) (2 diffs)

trunk/src/wp-admin/includes/class-wp-upgrader.php

@@ -1748 +1748 @@
             delete_site_transient( 'update_core' );
             $extra_update_stats['success'] = is_wp_error( $core_update_result ) ? $core_update_result->get_error_code() : true;
+            $extra_update_stats['error_data'] = is_wp_error( $core_update_result ) ? $core_update_result->get_error_data() : '';
             if ( is_wp_error( $core_update_result ) && 'rollback_was_required' == $core_update_result->get_error_code() ) {
                 $rollback_data = $core_update_result->get_error_data();
                 $extra_update_stats['success'] = is_wp_error( $rollback_data['update'] ) ? $rollback_data['update']->get_error_code() : $rollback_data['update'];
+                $extra_update_stats['error_data'] = is_wp_error( $rollback_data['update'] ) ? $rollback_data['update']->get_error_data() : '';
                 $extra_update_stats['rollback'] = is_wp_error( $rollback_data['rollback'] ) ? $rollback_data['rollback']->get_error_code() : true; // If it's not a WP_Error, the rollback was successful.
+                $extra_update_stats['rollback_data'] = is_wp_error( $rollback_data['rollback'] ) ? $rollback_data['rollback']->get_error_data() : '';
             }
             $extra_update_stats['fs_method'] = $GLOBALS['wp_filesystem']->method;
+            $extra_update_stats['fs_method_forced'] = defined( 'FS_METHOD' ) || has_filter( 'fs_method' );
             $extra_update_stats['time_taken'] = ( time() - $start_time );
             $extra_update_stats['attempted'] = $core_update->version;

trunk/src/wp-includes/update.php

@@ -87 +87 @@
     );
 
+    $post_body = array(
+        'translations' => json_encode( $translations ),
+    );
+
     if ( $extra_stats )
-        $query = array_merge( $query, $extra_stats );
+        $post_body = array_merge( $post_body, $extra_stats );
 
     $url = 'http://api.wordpress.org/core/version-check/1.7/?' . http_build_query( $query, null, '&' );
@@ -101 +105 @@
             'wp_blog' => home_url( '/' )
         ),
-        'body' => array(
-            'translations' => json_encode( $translations ),
-        ),
+        'body' => $post_body,
     );