Changeset 14228

Timestamp:

04/25/2010 05:39:39 AM (16 years ago)

Author:

dd32

Message:

Handle HTTP errors on popular tags requests, Handle HTTP Errors on listing loading slightly different no-js compatible. Fixes #13107

File:

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

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

@@ -44 +44 @@
         $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() );
+            $res = new WP_Error('plugins_api_failed', __('An Unexpected HTTP Error occurred during the API request.'), $request->get_error_message() );
         } else {
             $res = unserialize($request['body']);
             if ( false === $res )
-                $res = new WP_Error('plugins_api_failed', __('An unknown error occurred'), $request['body']);
+                $res = new WP_Error('plugins_api_failed', __('An unknown error occurred.'), $request['body']);
         }
     } elseif ( !is_wp_error($res) ) {
@@ -140 +140 @@
     $api_tags = install_popular_tags();
 
-    //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' => esc_url( admin_url('plugin-install.php?tab=search&type=tag&s=' . urlencode($tag['name'])) ),
-                                'name' => $tag['name'],
-                                'id' => sanitize_title_with_dashes($tag['name']),
-                                'count' => $tag['count'] );
     echo '<p class="popular-tags">';
-    echo wp_generate_tag_cloud($tags, array( 'single_text' => __('%d plugin'), 'multiple_text' => __('%d plugins') ) );
+    if ( is_wp_error($api_tags) ) {
+        echo $api_tags->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' => esc_url( admin_url('plugin-install.php?tab=search&type=tag&s=' . urlencode($tag['name'])) ),
+                                    'name' => $tag['name'],
+                                    'id' => sanitize_title_with_dashes($tag['name']),
+                                    'count' => $tag['count'] );
+        echo wp_generate_tag_cloud($tags, array( 'single_text' => __('%d plugin'), 'multiple_text' => __('%d plugins') ) );
+    }
     echo '</p><br class="clear" />';
 }
@@ -186 +190 @@
     $api = plugins_api('query_plugins', $args);
     if ( is_wp_error($api) )
-        wp_die($api);
+        wp_die($api->get_error_message() . '</p> <p class="hide-if-no-js"><a href="#" onclick="document.location.reload(); return false;">' . __('Try again') . '</a>');
     display_plugins_table($api->plugins, $api->info['page'], $api->info['pages']);
 }
@@ -202 +206 @@
     $api = plugins_api('query_plugins', $args);
     if ( is_wp_error($api) )
-        wp_die($api);
+        wp_die($api->get_error_message() . '</p> <p class="hide-if-no-js"><a href="#" onclick="document.location.reload(); return false;">' . __('Try again') . '</a>');
     display_plugins_table($api->plugins, $api->info['page'], $api->info['pages']);
 }
@@ -238 +242 @@
     $api = plugins_api('query_plugins', $args);
     if ( is_wp_error($api) )
-        wp_die($api);
+        wp_die($api->get_error_message() . '</p> <p class="hide-if-no-js"><a href="#" onclick="document.location.reload(); return false;">' . __('Try again') . '</a>');
     display_plugins_table($api->plugins, $api->info['page'], $api->info['pages']);
 }
@@ -255 +259 @@
     $api = plugins_api('query_plugins', $args);
     if ( is_wp_error($api) )
-        wp_die($api);
+        wp_die($api->get_error_message() . '</p> <p class="hide-if-no-js"><a href="#" onclick="document.location.reload(); return false;">' . __('Try again') . '</a>');
     display_plugins_table($api->plugins, $api->info['page'], $api->info['pages']);
 }