Steve-Dee-Designs
/
woocommerce
mirror of https://github.com/woocommerce/woocommerce.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed error display and incorrect use of WP_Error

This commit is contained in:
Claudio Sanches 2017-05-17 14:57:03 -03:00
parent 215a9fa0c1
commit ce6741e117
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
includes/admin/importers/class-wc-product-csv-importer-controller.php
View File

@ -219,7 +219,7 @@ class WC_Product_CSV_Importer_Controller {
$file = $this->handle_upload(); $file = $this->handle_upload();
if ( is_wp_error( $file ) ) { if ( is_wp_error( $file ) ) {
$this->add_error( $file->get_message() ); $this->add_error( $file->get_error_message() );
return; return;
} else { } else {
$this->file = $file; $this->file = $file;
@ -238,7 +238,7 @@ class WC_Product_CSV_Importer_Controller {
public function handle_upload() { public function handle_upload() {
if ( empty( $_POST['file_url'] ) ) { if ( empty( $_POST['file_url'] ) ) {
if ( ! isset( $_FILES['import'] ) ) { if ( ! isset( $_FILES['import'] ) ) {
return new WP_Error( __( 'File is empty. Please upload something more substantial. This error could also be caused by uploads being disabled in your php.ini or by post_max_size being defined as smaller than upload_max_filesize in php.ini.', 'woocommerce' ) ); return new WP_Error( 'woocommerce_product_csv_importer_upload_file_empty', __( 'File is empty. Please upload something more substantial. This error could also be caused by uploads being disabled in your php.ini or by post_max_size being defined as smaller than upload_max_filesize in php.ini.', 'woocommerce' ) );
} }
$overrides = array( 'test_form' => false, 'test_type' => false ); $overrides = array( 'test_form' => false, 'test_type' => false );
@ -246,7 +246,7 @@ class WC_Product_CSV_Importer_Controller {
$upload = wp_handle_upload( $_FILES['import'], $overrides ); $upload = wp_handle_upload( $_FILES['import'], $overrides );
if ( isset( $upload['error'] ) ) { if ( isset( $upload['error'] ) ) {
return new WP_Error( $upload['error'] ); return new WP_Error( 'woocommerce_product_csv_importer_upload_error', $upload['error'] );
} }
// Construct the object array // Construct the object array
@ -273,7 +273,7 @@ class WC_Product_CSV_Importer_Controller {
return ABSPATH . $_POST['file_url']; return ABSPATH . $_POST['file_url'];
} }
return new WP_Error( __( 'Please upload or provide the link to a valid CSV file.', 'woocommerce' ) ); return new WP_Error( 'woocommerce_product_csv_importer_upload_invalid_file', __( 'Please upload or provide the link to a valid CSV file.', 'woocommerce' ) );
} }
/** /**