From 936bf3661f1acfaff1ed90918cbb36ffd6beea5e Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Wed, 18 Oct 2017 17:58:48 +0000
Subject: [PATCH] Plugins: After [41608], make the markup in
 `WP_Plugin_Install_List_Table::no_items()` a bit more readable.

See #37430.
Built from https://develop.svn.wordpress.org/trunk@41915


git-svn-id: http://core.svn.wordpress.org/trunk@41749 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 .../includes/class-wp-plugin-install-list-table.php | 13 ++++++++-----
 wp-includes/version.php                             |  2 +-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/wp-admin/includes/class-wp-plugin-install-list-table.php b/wp-admin/includes/class-wp-plugin-install-list-table.php
index a1b4c9213b..f8bbb5fb65 100644
--- a/wp-admin/includes/class-wp-plugin-install-list-table.php
+++ b/wp-admin/includes/class-wp-plugin-install-list-table.php
@@ -255,7 +255,7 @@ class WP_Plugin_Install_List_Table extends WP_List_Table {
 
 			if ( $upgrade_plugins ) {
 				$js_plugins['upgrade'] = array_values( $upgrade_plugins );
-			}
+	}
 
 			wp_localize_script( 'updates', '_wpUpdatesItemCounts', array(
 				'plugins' => $js_plugins,
@@ -267,10 +267,13 @@ class WP_Plugin_Install_List_Table extends WP_List_Table {
 	/**
 	 */
 	public function no_items() {
-		if ( isset( $this->error ) ) {
-			echo '<div class="inline error"><p>' . $this->error->get_error_message() . '</p><p class="hide-if-no-js"><button class="button try-again">' . __( 'Try Again' ) . '</button></p></div>';
-		} else {
-			echo '<div class="no-plugin-results">' . __( 'No plugins found. Try a different search.' ) . '</div>';
+		if ( isset( $this->error ) ) { ?>
+			<div class="inline error"><p><?php echo $this->error->get_error_message(); ?></p>
+				<p class="hide-if-no-js"><button class="button try-again"><?php _e( 'Try Again' ); ?></button></p>
+			</div>
+		<?php } else { ?>
+			<div class="no-plugin-results"><?php _e( 'No plugins found. Try a different search.' ); ?></div>
+		<?php
 		}
 	}
 
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 4f1b731c94..7f4d92083e 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.9-beta2-41914';
+$wp_version = '4.9-beta2-41915';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.