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() . '
' . __( 'Try again' ) . '' );
+ 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 '
' . __( 'No plugins match your request.' ) . '
';
+ if ( isset( $this->error ) ) {
+ $message = $this->error->get_error_message() . '' . __( 'Try again' ) . '
';
+ } else {
+ $message = __( 'No plugins match your request.' );
+ }
+ echo '' . $message . '
';
}
protected function get_views() {