WordPress.org

Make WordPress Core

Changeset 20752


Ignore:
Timestamp:
05/09/12 15:55:59 (2 years ago)
Author:
ryan
Message:

Friendlier strings with links to the support forums when experiencing problems talking to api.wordpress.org. fixes #20605

Location:
trunk/wp-admin/includes
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-admin/includes/plugin-install.php

    r20675 r20752  
    4444        $request = wp_remote_post('http://api.wordpress.org/plugins/info/1.0/', array( 'timeout' => 15, 'body' => array('action' => $action, 'request' => serialize($args))) ); 
    4545        if ( is_wp_error($request) ) { 
    46             $res = new WP_Error('plugins_api_failed', __('An Unexpected HTTP Error occurred during the API request.'), $request->get_error_message() ); 
     46            $res = new WP_Error('plugins_api_failed', __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="http://wordpress.org/support/">support forums</a>.' ), $request->get_error_message() ); 
    4747        } else { 
    4848            $res = maybe_unserialize( wp_remote_retrieve_body( $request ) ); 
    4949            if ( ! is_object( $res ) && ! is_array( $res ) ) 
    50                 $res = new WP_Error('plugins_api_failed', __('An unknown error occurred during the API request.'), wp_remote_retrieve_body( $request ) ); 
     50                $res = new WP_Error('plugins_api_failed', __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="http://wordpress.org/support/">support forums</a>.' ), wp_remote_retrieve_body( $request ) ); 
    5151        } 
    5252    } elseif ( !is_wp_error($res) ) { 
  • trunk/wp-admin/includes/theme.php

    r20733 r20752  
    284284        $request = wp_remote_post('http://api.wordpress.org/themes/info/1.0/', array( 'body' => array('action' => $action, 'request' => serialize($args))) ); 
    285285        if ( is_wp_error($request) ) { 
    286             $res = new WP_Error('themes_api_failed', __('An Unexpected HTTP Error occurred during the API request.'), $request->get_error_message() ); 
     286            $res = new WP_Error('themes_api_failed', __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="http://wordpress.org/support/">support forums</a>.' ), $request->get_error_message() ); 
    287287        } else { 
    288288            $res = maybe_unserialize( wp_remote_retrieve_body( $request ) ); 
    289289            if ( ! is_object( $res ) && ! is_array( $res ) ) 
    290                 $res = new WP_Error('themes_api_failed', __('An unknown error occurred during the API request.'), wp_remote_retrieve_body( $request ) ); 
     290                $res = new WP_Error('themes_api_failed', __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="http://wordpress.org/support/">support forums</a>.' ), wp_remote_retrieve_body( $request ) ); 
    291291        } 
    292292    } 
Note: See TracChangeset for help on using the changeset viewer.