WordPress.org

Make WordPress Core


Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/3.7/src/wp-admin/includes/update.php

    r25872 r25957  
    104104    $return = array();
    105105
    106     $url = 'http://api.wordpress.org/core/checksums/1.0/?' . http_build_query( compact( 'version', 'locale' ), null, '&' );
    107 
    108     if ( wp_http_supports( array( 'ssl' ) ) )
     106    $url = $http_url = 'http://api.wordpress.org/core/checksums/1.0/?' . http_build_query( compact( 'version', 'locale' ), null, '&' );
     107
     108    if ( $ssl = wp_http_supports( array( 'ssl' ) ) )
    109109        $url = set_url_scheme( $url, 'https' );
    110110
     
    114114
    115115    $response = wp_remote_get( $url, $options );
     116    if ( $ssl && is_wp_error( $response ) ) {
     117        trigger_error( __( '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>.' ) . ' ' . '(WordPress could not establish a secure connection to WordPress.org. Please contact your server administrator.)', headers_sent() || WP_DEBUG ? E_USER_WARNING : E_USER_NOTICE );
     118        $response = wp_remote_get( $http_url, $options );
     119    }
    116120
    117121    if ( is_wp_error( $response ) || 200 != wp_remote_retrieve_response_code( $response ) )
Note: See TracChangeset for help on using the changeset viewer.