From fae5c2de6f4f1b11ccecbcf6b1f0b686c25d789b Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Mon, 25 Aug 2014 15:01:50 +0000
Subject: [PATCH] Install Plugins: Don't wp_die() if API can't be reached.

props johnbillion.
fixes #29361.

git-svn-id: https://develop.svn.wordpress.org/trunk@29594 602fd350-edb4-49c9-b593-d223f7449a82
---
 .../includes/class-wp-plugin-install-list-table.php | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/wp-admin/includes/class-wp-plugin-install-list-table.php b/src/wp-admin/includes/class-wp-plugin-install-list-table.php
index c130be4a93..3d8d767972 100644
--- a/src/wp-admin/includes/class-wp-plugin-install-list-table.php
+++ b/src/wp-admin/includes/class-wp-plugin-install-list-table.php
@@ -168,8 +168,10 @@ class WP_Plugin_Install_List_Table extends WP_List_Table {
 
 		$api = plugins_api( 'query_plugins', $args );
 
-		if ( is_wp_error( $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>' );
+		if ( is_wp_error( $api ) ) {
+			$this->error = $api;
+			return;
+		}
 
 		$this->items = $api->plugins;
 
@@ -188,7 +190,12 @@ class WP_Plugin_Install_List_Table extends WP_List_Table {
 	}
 
 	public function no_items() {
-		echo '<div class="wp-filter-no-results">' . __( 'No plugins match your request.' ) . '</div>';
+		if ( isset( $this->error ) ) {
+			$message = $this->error->get_error_message() . '<p class="hide-if-no-js"><a href="#" class="button" onclick="document.location.reload(); return false;">' . __( 'Try again' ) . '</a></p>';
+		} else {
+			$message = __( 'No plugins match your request.' );
+		}
+		echo '<div class="wp-filter-no-results">' . $message . '</div>';
 	}
 
 	protected function get_views() {