Changeset 9327

Timestamp:

10/24/2008 06:22:43 PM (18 years ago)

Author:

ryan

Message:

Better error response when fetching attachments. Props DD32. see #7944

Location:

trunk

Files:

• wp-admin/import/wordpress.php (modified) (1 diff)
• wp-includes/functions.php (modified) (1 diff)

trunk/wp-admin/import/wordpress.php

@@ -605 +605 @@
                 $headers = wp_get_http($url, $upload['file']);
 
+                //Request failed
+                if ( ! $headers ) {
+                        @unlink($upload['file']);
+                        return new WP_Error( 'import_file_error', __('Remote server did not respond') );
+                }
+
                 // make sure the fetch was successful
                 if ( $headers['response'] != '200' ) {
                         @unlink($upload['file']);
-                        return new WP_Error( 'import_file_error', sprintf(__('Remote file returned error response %d'), intval($headers['response'])) );
+                        return new WP_Error( 'import_file_error', sprintf(__('Remote file returned error response %1$d %2$s'), $headers['response'], get_status_header_desc($headers['response']) ) );
                 }
                 elseif ( isset($headers['content-length']) && filesize($upload['file']) != $headers['content-length'] ) {

trunk/wp-includes/functions.php

@@ -1052 +1052 @@
 
         $headers = wp_remote_retrieve_headers( $response );
+        $headers['response'] = $response['response']['code'];
+
         if ( false == $file_path )
                 return $headers;