<!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>[14228] trunk/wp-admin/includes/plugin-install.php:
  Handle HTTP errors on popular tags requests,
  Handle HTTP Errors on listing loading slightly different no-js compatible.</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14228">14228</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2010-04-25 05:39:39 +0000 (Sun, 25 Apr 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>Handle HTTP errors on popular tags requests, Handle HTTP Errors on listing loading slightly different no-js compatible. Fixes <a href="http://trac.wordpress.org/ticket/13107">#13107</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 (14227 => 14228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/plugin-install.php        2010-04-25 01:02:51 UTC (rev 14227)
+++ trunk/wp-admin/includes/plugin-install.php        2010-04-25 05:39:39 UTC (rev 14228)
</span><span class="lines">@@ -43,11 +43,11 @@
</span><span class="cx">         if ( false === $res ) {
</span><span class="cx">                 $request = wp_remote_post('http://api.wordpress.org/plugins/info/1.0/', array( 'timeout' =&gt; 15, 'body' =&gt; array('action' =&gt; $action, 'request' =&gt; serialize($args))) );
</span><span class="cx">                 if ( is_wp_error($request) ) {
</span><del>-                        $res = new WP_Error('plugins_api_failed', __('An Unexpected HTTP Error occurred during the API request.&lt;/p&gt; &lt;p&gt;&lt;a href=&quot;?&quot; onclick=&quot;document.location.reload(); return false;&quot;&gt;Try again&lt;/a&gt;'), $request-&gt;get_error_message() );
</del><ins>+                        $res = new WP_Error('plugins_api_failed', __('An Unexpected HTTP Error occurred during the API request.'), $request-&gt;get_error_message() );
</ins><span class="cx">                 } else {
</span><span class="cx">                         $res = unserialize($request['body']);
</span><span class="cx">                         if ( false === $res )
</span><del>-                                $res = new WP_Error('plugins_api_failed', __('An unknown error occurred'), $request['body']);
</del><ins>+                                $res = new WP_Error('plugins_api_failed', __('An unknown error occurred.'), $request['body']);
</ins><span class="cx">                 }
</span><span class="cx">         } elseif ( !is_wp_error($res) ) {
</span><span class="cx">                 $res-&gt;external = true;
</span><span class="lines">@@ -139,16 +139,20 @@
</span><span class="cx"> 
</span><span class="cx">         $api_tags = install_popular_tags();
</span><span class="cx"> 
</span><del>-        //Set up the tags in a way which can be interprated by wp_generate_tag_cloud()
-        $tags = array();
-        foreach ( (array)$api_tags as $tag )
-                $tags[ $tag['name'] ] = (object) array(
-                                                                'link' =&gt; esc_url( admin_url('plugin-install.php?tab=search&amp;type=tag&amp;s=' . urlencode($tag['name'])) ),
-                                                                'name' =&gt; $tag['name'],
-                                                                'id' =&gt; sanitize_title_with_dashes($tag['name']),
-                                                                'count' =&gt; $tag['count'] );
</del><span class="cx">         echo '&lt;p class=&quot;popular-tags&quot;&gt;';
</span><del>-        echo wp_generate_tag_cloud($tags, array( 'single_text' =&gt; __('%d plugin'), 'multiple_text' =&gt; __('%d plugins') ) );
</del><ins>+        if ( is_wp_error($api_tags) ) {
+                echo $api_tags-&gt;get_error_message();
+        } else {
+                //Set up the tags in a way which can be interprated by wp_generate_tag_cloud()
+                $tags = array();
+                foreach ( (array)$api_tags as $tag )
+                        $tags[ $tag['name'] ] = (object) array(
+                                                                        'link' =&gt; esc_url( admin_url('plugin-install.php?tab=search&amp;type=tag&amp;s=' . urlencode($tag['name'])) ),
+                                                                        'name' =&gt; $tag['name'],
+                                                                        'id' =&gt; sanitize_title_with_dashes($tag['name']),
+                                                                        'count' =&gt; $tag['count'] );
+                echo wp_generate_tag_cloud($tags, array( 'single_text' =&gt; __('%d plugin'), 'multiple_text' =&gt; __('%d plugins') ) );
+        }
</ins><span class="cx">         echo '&lt;/p&gt;&lt;br class=&quot;clear&quot; /&gt;';
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -185,7 +189,7 @@
</span><span class="cx">         $args = array('browse' =&gt; 'featured', 'page' =&gt; $page);
</span><span class="cx">         $api = plugins_api('query_plugins', $args);
</span><span class="cx">         if ( is_wp_error($api) )
</span><del>-                wp_die($api);
</del><ins>+                wp_die($api-&gt;get_error_message() . '&lt;/p&gt; &lt;p class=&quot;hide-if-no-js&quot;&gt;&lt;a href=&quot;#&quot; onclick=&quot;document.location.reload(); return false;&quot;&gt;' . __('Try again') . '&lt;/a&gt;');
</ins><span class="cx">         display_plugins_table($api-&gt;plugins, $api-&gt;info['page'], $api-&gt;info['pages']);
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -201,7 +205,7 @@
</span><span class="cx">         $args = array('browse' =&gt; 'popular', 'page' =&gt; $page);
</span><span class="cx">         $api = plugins_api('query_plugins', $args);
</span><span class="cx">         if ( is_wp_error($api) )
</span><del>-                wp_die($api);
</del><ins>+                wp_die($api-&gt;get_error_message() . '&lt;/p&gt; &lt;p class=&quot;hide-if-no-js&quot;&gt;&lt;a href=&quot;#&quot; onclick=&quot;document.location.reload(); return false;&quot;&gt;' . __('Try again') . '&lt;/a&gt;');
</ins><span class="cx">         display_plugins_table($api-&gt;plugins, $api-&gt;info['page'], $api-&gt;info['pages']);
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -237,7 +241,7 @@
</span><span class="cx">         $args = array('browse' =&gt; 'new', 'page' =&gt; $page);
</span><span class="cx">         $api = plugins_api('query_plugins', $args);
</span><span class="cx">         if ( is_wp_error($api) )
</span><del>-                wp_die($api);
</del><ins>+                wp_die($api-&gt;get_error_message() . '&lt;/p&gt; &lt;p class=&quot;hide-if-no-js&quot;&gt;&lt;a href=&quot;#&quot; onclick=&quot;document.location.reload(); return false;&quot;&gt;' . __('Try again') . '&lt;/a&gt;');
</ins><span class="cx">         display_plugins_table($api-&gt;plugins, $api-&gt;info['page'], $api-&gt;info['pages']);
</span><span class="cx"> }
</span><span class="cx"> add_action('install_plugins_updated', 'install_updated', 10, 1);
</span><span class="lines">@@ -254,7 +258,7 @@
</span><span class="cx">         $args = array('browse' =&gt; 'updated', 'page' =&gt; $page);
</span><span class="cx">         $api = plugins_api('query_plugins', $args);
</span><span class="cx">         if ( is_wp_error($api) )
</span><del>-                wp_die($api);
</del><ins>+                wp_die($api-&gt;get_error_message() . '&lt;/p&gt; &lt;p class=&quot;hide-if-no-js&quot;&gt;&lt;a href=&quot;#&quot; onclick=&quot;document.location.reload(); return false;&quot;&gt;' . __('Try again') . '&lt;/a&gt;');
</ins><span class="cx">         display_plugins_table($api-&gt;plugins, $api-&gt;info['page'], $api-&gt;info['pages']);
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>