<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[12742] trunk/wp-admin/includes/plugin-install.php:
Add extra error checking to the Plugin Browser and Plugin API function.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12742">12742</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2010-01-17 03:26:50 +0000 (Sun, 17 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add extra error checking to the Plugin Browser and Plugin API function. Fixes <a href="http://trac.wordpress.org/ticket/11640">#11640</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesplugininstallphp">trunk/wp-admin/includes/plugin-install.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesplugininstallphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/plugin-install.php (12741 => 12742)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/plugin-install.php 2010-01-17 02:57:59 UTC (rev 12741)
+++ trunk/wp-admin/includes/plugin-install.php 2010-01-17 03:26:50 UTC (rev 12742)
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @param string $action
</span><span class="cx"> * @param array|object $args Optional. Arguments to serialize for the Plugin Info API.
</span><del>- * @return mixed
</del><ins>+ * @return object plugins_api response object on success, WP_Error on failure.
</ins><span class="cx"> */
</span><span class="cx"> function plugins_api($action, $args = null) {
</span><span class="cx">
</span><span class="lines">@@ -34,16 +34,19 @@
</span><span class="cx"> if ( !isset($args->per_page) )
</span><span class="cx"> $args->per_page = 24;
</span><span class="cx">
</span><del>- $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.
</del><ins>+ // 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);
</ins><span class="cx">
</span><del>- if ( ! $res ) {
- $request = wp_remote_post('http://api.wordpress.org/plugins/info/1.0/', array( 'body' => array('action' => $action, 'request' => serialize($args))) );
</del><ins>+ 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))) );
</ins><span class="cx"> if ( is_wp_error($request) ) {
</span><span class="cx"> $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() );
</span><span class="cx"> } else {
</span><span class="cx"> $res = unserialize($request['body']);
</span><del>- if ( ! $res )
</del><ins>+ if ( false === $res )
</ins><span class="cx"> $res = new WP_Error('plugins_api_failed', __('An unknown error occurred'), $request['body']);
</span><span class="cx"> }
</span><span class="cx"> } elseif ( !is_wp_error($res) ) {
</span><span class="lines">@@ -197,6 +200,8 @@
</span><span class="cx"> function install_popular($page = 1) {
</span><span class="cx"> $args = array('browse' => 'popular', 'page' => $page);
</span><span class="cx"> $api = plugins_api('query_plugins', $args);
</span><ins>+ if ( is_wp_error($api) )
+ wp_die($api);
</ins><span class="cx"> display_plugins_table($api->plugins, $api->info['page'], $api->info['pages']);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -248,6 +253,8 @@
</span><span class="cx"> function install_updated($page = 1) {
</span><span class="cx"> $args = array('browse' => 'updated', 'page' => $page);
</span><span class="cx"> $api = plugins_api('query_plugins', $args);
</span><ins>+ if ( is_wp_error($api) )
+ wp_die($api);
</ins><span class="cx"> display_plugins_table($api->plugins, $api->info['page'], $api->info['pages']);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>