Changeset 29594

Timestamp:

08/25/2014 03:01:50 PM (11 years ago)

Author:

SergeyBiryukov

Message:

Install Plugins: Don't wp_die() if API can't be reached.

props johnbillion.
fixes #29361.

File:

• trunk/src/wp-admin/includes/class-wp-plugin-install-list-table.php (modified) (2 diffs)

trunk/src/wp-admin/includes/class-wp-plugin-install-list-table.php

@@ -169 +169 @@
         $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;
@@ -189 +191 @@
 
     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>';
     }