Changeset 12742

Timestamp:

01/17/2010 03:26:50 AM (17 years ago)

Author:

dd32

Message:

Add extra error checking to the Plugin Browser and Plugin API function. Fixes #11640

File:

• trunk/wp-admin/includes/plugin-install.php (modified) (4 diffs)

trunk/wp-admin/includes/plugin-install.php

@@ -25 +25 @@
  * @param string $action
  * @param array|object $args Optional. Arguments to serialize for the Plugin Info API.
- * @return mixed
+ * @return object plugins_api response object on success, WP_Error on failure.
  */
 function plugins_api($action, $args = null) {
@@ -35 +35 @@
                 $args->per_page = 24;
 
-        $args = apply_filters('plugins_api_args', $args, $action); //NOTE: Ensure that an object is returned via this filter.
-        $res = apply_filters('plugins_api', false, $action, $args); //NOTE: Allows a plugin to completely override the builtin WordPress.org API.
-
-        if ( ! $res ) {
-                $request = wp_remote_post('http://api.wordpress.org/plugins/info/1.0/', array( 'body' => array('action' => $action, 'request' => serialize($args))) );
+        // Allows a plugin to override the WordPress.org API entirely. 
+        // Use the filter 'plugins_api_result' to mearly 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);
+
+        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))) );
                 if ( is_wp_error($request) ) {
                         $res = new WP_Error('plugins_api_failed', __('An Unexpected HTTP Error occurred during the API request.</p> <p><a href="?" onclick="document.location.reload(); return false;">Try again</a>'), $request->get_error_message() );
                 } else {
                         $res = unserialize($request['body']);
-                        if ( ! $res )
+                        if ( false === $res )
                                 $res = new WP_Error('plugins_api_failed', __('An unknown error occurred'), $request['body']);
                 }
@@ -198 +201 @@
         $args = array('browse' => 'popular', 'page' => $page);
         $api = plugins_api('query_plugins', $args);
+        if ( is_wp_error($api) )
+                wp_die($api);
         display_plugins_table($api->plugins, $api->info['page'], $api->info['pages']);
 }
@@ -249 +254 @@
         $args = array('browse' => 'updated', 'page' => $page);
         $api = plugins_api('query_plugins', $args);
+        if ( is_wp_error($api) )
+                wp_die($api);
         display_plugins_table($api->plugins, $api->info['page'], $api->info['pages']);
 }