Skip to content

Check for WP_Error result to return correct error messages. #72

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 23, 2020
Merged

Check for WP_Error result to return correct error messages. #72

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 22 additions & 1 deletion src/class-wp-import.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1010,12 +1010,33 @@ function fetch_remote_file( $url, $post ) {
),
) );

if ( is_wp_error( $remote_response ) ) {
@unlink( $tmp_file_name );
return new WP_Error(
'import_file_error',
sprintf(
/* translators: 1: The WordPress error message. 2: The WordPress error code. */
__( 'Request failed due to an error: %1$s (%2$s)', 'wordpress-importer' ),
esc_html( $remote_response->get_error_message() ),
esc_html( $remote_response->get_error_code() )
)
);
}

$remote_response_code = (int) wp_remote_retrieve_response_code( $remote_response );

// Make sure the fetch was successful.
if ( 200 !== $remote_response_code ) {
@unlink( $tmp_file_name );
return new WP_Error( 'import_file_error', sprintf( __('Remote server returned error response %1$d %2$s', 'wordpress-importer'), esc_html($remote_response_code), get_status_header_desc($remote_response_code) ) );
return new WP_Error(
'import_file_error',
sprintf(
/* translators: 1: The HTTP error message. 2: The HTTP error code. */
__( 'Remote server returned the following unexpected result: %1$s (%2$s)', 'wordpress-importer' ),
get_status_header_desc( $remote_response_code ),
esc_html( $remote_response_code )
)
);
}

$headers = wp_remote_retrieve_headers( $remote_response );
Expand Down