WordPress 3.7.1

[autoinstalls/wordpress.git] / wp-admin / includes / plugin-install.php

diff --git a/wp-admin/includes/plugin-install.php b/wp-admin/includes/plugin-install.php
index 7f1e0f2c62b4e6a154705da1f1ec4cf8d7c139fa..58a9e9bab70e6468871ae19ba9c7a91c1ce7e1a2 100644 (file)
--- a/wp-admin/includes/plugin-install.php
+++ b/wp-admin/includes/plugin-install.php
@@ -60,17 +60,23 @@ function plugins_api($action, $args = null) {
        $res = apply_filters( 'plugins_api', false, $action, $args );
 
        if ( false === $res ) {
        $res = apply_filters( 'plugins_api', false, $action, $args );
 
        if ( false === $res ) {

-               $url = 'http://api.wordpress.org/plugins/info/1.0/';
-               if ( wp_http_supports( array( 'ssl' ) ) )
+               $url = $http_url = 'http://api.wordpress.org/plugins/info/1.0/';
+               if ( $ssl = wp_http_supports( array( 'ssl' ) ) )

                        $url = set_url_scheme( $url, 'https' );
 
                        $url = set_url_scheme( $url, 'https' );
 

-               $request = wp_remote_post( $url, array(
+               $args = array(

                        'timeout' => 15,
                        'body' => array(
                                'action' => $action,
                                'request' => serialize( $args )
                        )
                        'timeout' => 15,
                        'body' => array(
                                'action' => $action,
                                'request' => serialize( $args )
                        )

-               ) );
+               );
+               $request = wp_remote_post( $url, $args );
+
+               if ( $ssl && is_wp_error( $request ) ) {
+                       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 );
+                       $request = wp_remote_post( $http_url, $args );
+               }

 
                if ( is_wp_error($request) ) {
                        $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() );
 
                if ( is_wp_error($request) ) {
                        $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() );