Wordpress 3.7

[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 1c07b6856c10b609ee959c4104d6a14799949368..7f1e0f2c62b4e6a154705da1f1ec4cf8d7c139fa 100644 (file)
--- a/wp-admin/includes/plugin-install.php
+++ b/wp-admin/includes/plugin-install.php
@@ -34,14 +34,44 @@ function plugins_api($action, $args = null) {
        if ( !isset($args->per_page) )
                $args->per_page = 24;
 
        if ( !isset($args->per_page) )
                $args->per_page = 24;
 

-       // Allows a plugin to override the WordPress.org API entirely.
-       // Use the filter 'plugins_api_result' to merely add results.
-       // Please ensure that a object is returned from the following filters.
-       $args = apply_filters('plugins_api_args', $args, $action);
-       $res = apply_filters('plugins_api', false, $action, $args);
+       /**
+        * Override the Plugin Install API arguments.
+        *
+        * Please ensure that an object is returned.
+        *
+        * @since 2.7.0
+        *
+        * @param object $args   Plugin API arguments.
+        * @param string $action The type of information being requested from the Plugin Install API.
+        */
+       $args = apply_filters( 'plugins_api_args', $args, $action );
+
+       /**
+        * Allows a plugin to override the WordPress.org Plugin Install API entirely.
+        *
+        * Please ensure that an object is returned.
+        *
+        * @since 2.7.0
+        *
+        * @param bool|object         The result object. Default is false.
+        * @param string      $action The type of information being requested from the Plugin Install API.
+        * @param object      $args   Plugin API arguments.
+        */
+       $res = apply_filters( 'plugins_api', false, $action, $args );

 
        if ( false === $res ) {
 
        if ( false === $res ) {

-               $request = wp_remote_post('http://api.wordpress.org/plugins/info/1.0/', array( 'timeout' => 15, 'body' => array('action' => $action, 'request' => serialize($args))) );
+               $url = 'http://api.wordpress.org/plugins/info/1.0/';
+               if ( wp_http_supports( array( 'ssl' ) ) )
+                       $url = set_url_scheme( $url, 'https' );
+
+               $request = wp_remote_post( $url, array(
+                       'timeout' => 15,
+                       'body' => array(
+                               'action' => $action,
+                               'request' => serialize( $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() );
                } else {
                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() );
                } else {


@@ -53,7 +83,16 @@ function plugins_api($action, $args = null) {
                $res->external = true;
        }
 
                $res->external = true;
        }
 

-       return apply_filters('plugins_api_result', $res, $action, $args);
+       /**
+        * Filter the Plugin Install API response results.
+        *
+        * @since 2.7.0
+        *
+        * @param object|WP_Error $res    Response object or WP_Error.
+        * @param string          $action The type of information being requested from the Plugin Install API.
+        * @param object          $args   Plugin API arguments.
+        */
+       return apply_filters( 'plugins_api_result', $res, $action, $args );

 }
 
 /**
 }
 
 /**


@@ -265,7 +304,7 @@ function install_plugin_install_status($api, $loop = false) {
 function install_plugin_information() {
        global $tab;
 
 function install_plugin_information() {
        global $tab;
 

-       $api = plugins_api('plugin_information', array('slug' => wp_unslash( $_REQUEST['plugin'] ) ));
+       $api = plugins_api( 'plugin_information', array( 'slug' => wp_unslash( $_REQUEST['plugin'] ), 'is_ssl' => is_ssl() ) );

 
        if ( is_wp_error($api) )
                wp_die($api);
 
        if ( is_wp_error($api) )
                wp_die($api);


@@ -296,9 +335,11 @@ function install_plugin_information() {
                        $api->$key = wp_kses( $api->$key, $plugins_allowedtags );
        }
 
                        $api->$key = wp_kses( $api->$key, $plugins_allowedtags );
        }
 

-       $section = isset($_REQUEST['section']) ? wp_unslash( $_REQUEST['section'] ) : 'description'; //Default to the Description tab, Do not translate, API returns English.
-       if ( empty($section) || ! isset($api->sections[ $section ]) )
-               $section = array_shift( $section_titles = array_keys((array)$api->sections) );
+       $section = isset( $_REQUEST['section'] ) ? wp_unslash( $_REQUEST['section'] ) : 'description'; //Default to the Description tab, Do not translate, API returns English.
+       if ( empty( $section ) || ! isset( $api->sections[ $section ] ) ) {
+               $section_titles = array_keys( (array) $api->sections );
+               $section = array_shift( $section_titles );
+       }

 
        iframe_header( __('Plugin Install') );
        echo "<div id='$tab-header'>\n";
 
        iframe_header( __('Plugin Install') );
        echo "<div id='$tab-header'>\n";