WordPress.org
Get WordPress

Make WordPress Core


Ignore:
Timestamp:
02/27/2018 02:30:46 AM (7 years ago)
Author:
SergeyBiryukov
Message:

General: Introduce WP_Error::has_errors() method and use it where appropriate.

Props robdxw, DrewAPicture, SergeyBiryukov.
Fixes #42742.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/wp-admin/includes/ajax-actions.php

    r42720 r42761  
    36933693        $status['errorMessage'] = $skin->result->get_error_message();
    36943694        wp_send_json_error( $status );
    3695     } elseif ( $skin->get_errors()->get_error_code() ) {
     3695    } elseif ( $skin->get_errors()->has_errors() ) {
    36963696        $status['errorMessage'] = $skin->get_error_messages();
    36973697        wp_send_json_error( $status );
    … …  
    37033703
    37043704        // Pass through the error from WP_Filesystem if one was raised.
    3705         if ( $wp_filesystem instanceof WP_Filesystem_Base && is_wp_error( $wp_filesystem->errors ) && $wp_filesystem->errors->get_error_code() ) {
     3705        if ( $wp_filesystem instanceof WP_Filesystem_Base && is_wp_error( $wp_filesystem->errors ) && $wp_filesystem->errors->has_errors() ) {
    37063706            $status['errorMessage'] = esc_html( $wp_filesystem->errors->get_error_message() );
    37073707        }
    … …  
    38063806        $status['errorMessage'] = $skin->result->get_error_message();
    38073807        wp_send_json_error( $status );
    3808     } elseif ( $skin->get_errors()->get_error_code() ) {
     3808    } elseif ( $skin->get_errors()->has_errors() ) {
    38093809        $status['errorMessage'] = $skin->get_error_messages();
    38103810        wp_send_json_error( $status );
    … …  
    38303830
    38313831        // Pass through the error from WP_Filesystem if one was raised.
    3832         if ( $wp_filesystem instanceof WP_Filesystem_Base && is_wp_error( $wp_filesystem->errors ) && $wp_filesystem->errors->get_error_code() ) {
     3832        if ( $wp_filesystem instanceof WP_Filesystem_Base && is_wp_error( $wp_filesystem->errors ) && $wp_filesystem->errors->has_errors() ) {
    38333833            $status['errorMessage'] = esc_html( $wp_filesystem->errors->get_error_message() );
    38343834        }
    … …  
    38923892
    38933893        // Pass through the error from WP_Filesystem if one was raised.
    3894         if ( $wp_filesystem instanceof WP_Filesystem_Base && is_wp_error( $wp_filesystem->errors ) && $wp_filesystem->errors->get_error_code() ) {
     3894        if ( $wp_filesystem instanceof WP_Filesystem_Base && is_wp_error( $wp_filesystem->errors ) && $wp_filesystem->errors->has_errors() ) {
    38953895            $status['errorMessage'] = esc_html( $wp_filesystem->errors->get_error_message() );
    38963896        }
    … …  
    39813981        $status['errorMessage'] = $skin->result->get_error_message();
    39823982        wp_send_json_error( $status );
    3983     } elseif ( $skin->get_errors()->get_error_code() ) {
     3983    } elseif ( $skin->get_errors()->has_errors() ) {
    39843984        $status['errorMessage'] = $skin->get_error_messages();
    39853985        wp_send_json_error( $status );
    … …  
    39913991
    39923992        // Pass through the error from WP_Filesystem if one was raised.
    3993         if ( $wp_filesystem instanceof WP_Filesystem_Base && is_wp_error( $wp_filesystem->errors ) && $wp_filesystem->errors->get_error_code() ) {
     3993        if ( $wp_filesystem instanceof WP_Filesystem_Base && is_wp_error( $wp_filesystem->errors ) && $wp_filesystem->errors->has_errors() ) {
    39943994            $status['errorMessage'] = esc_html( $wp_filesystem->errors->get_error_message() );
    39953995        }
    … …  
    40824082        $status['errorMessage'] = $skin->result->get_error_message();
    40834083        wp_send_json_error( $status );
    4084     } elseif ( $skin->get_errors()->get_error_code() ) {
     4084    } elseif ( $skin->get_errors()->has_errors() ) {
    40854085        $status['errorMessage'] = $skin->get_error_messages();
    40864086        wp_send_json_error( $status );
    … …  
    41164116
    41174117        // Pass through the error from WP_Filesystem if one was raised.
    4118         if ( $wp_filesystem instanceof WP_Filesystem_Base && is_wp_error( $wp_filesystem->errors ) && $wp_filesystem->errors->get_error_code() ) {
     4118        if ( $wp_filesystem instanceof WP_Filesystem_Base && is_wp_error( $wp_filesystem->errors ) && $wp_filesystem->errors->has_errors() ) {
    41194119            $status['errorMessage'] = esc_html( $wp_filesystem->errors->get_error_message() );
    41204120        }
    … …  
    41834183
    41844184        // Pass through the error from WP_Filesystem if one was raised.
    4185         if ( $wp_filesystem instanceof WP_Filesystem_Base && is_wp_error( $wp_filesystem->errors ) && $wp_filesystem->errors->get_error_code() ) {
     4185        if ( $wp_filesystem instanceof WP_Filesystem_Base && is_wp_error( $wp_filesystem->errors ) && $wp_filesystem->errors->has_errors() ) {
    41864186            $status['errorMessage'] = esc_html( $wp_filesystem->errors->get_error_message() );
    41874187        }
Note: See TracChangeset for help on using the changeset viewer.