From ded3a1d72f563100f58d2a77ec33ebb5bcfaea1f Mon Sep 17 00:00:00 2001
From: Pascal Birchler <pascal.birchler@gmail.com>
Date: Thu, 14 Jan 2016 09:07:26 +0000
Subject: [PATCH] Plugins: Make sure the 'Beta testing' tab is first in the
 plugin installer.

This makes feature plugins more discoverable for people running development builds.

Fixes #29631.
Built from https://develop.svn.wordpress.org/trunk@36297


git-svn-id: http://core.svn.wordpress.org/trunk@36264 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 .../includes/class-wp-plugin-install-list-table.php  | 12 ++++++------
 wp-admin/includes/plugin-install.php                 |  6 ++++++
 wp-includes/version.php                              |  2 +-
 3 files changed, 13 insertions(+), 7 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 1e985c4689..d3f1b87744 100644
--- a/wp-admin/includes/class-wp-plugin-install-list-table.php
+++ b/wp-admin/includes/class-wp-plugin-install-list-table.php
@@ -86,15 +86,15 @@ class WP_Plugin_Install_List_Table extends WP_List_Table {
 		$tabs = array();
 
 		if ( 'search' === $tab ) {
-			$tabs['search']	= __( 'Search Results' );
+			$tabs['search'] = __( 'Search Results' );
 		}
-		$tabs['featured']  = _x( 'Featured', 'Plugin Installer' );
-		$tabs['popular']   = _x( 'Popular', 'Plugin Installer' );
-		$tabs['recommended']   = _x( 'Recommended', 'Plugin Installer' );
-		$tabs['favorites'] = _x( 'Favorites', 'Plugin Installer' );
 		if ( $tab === 'beta' || false !== strpos( $GLOBALS['wp_version'], '-' ) ) {
-			$tabs['beta']      = _x( 'Beta Testing', 'Plugin Installer' );
+			$tabs['beta'] = _x( 'Beta Testing', 'Plugin Installer' );
 		}
+		$tabs['featured']    = _x( 'Featured', 'Plugin Installer' );
+		$tabs['popular']     = _x( 'Popular', 'Plugin Installer' );
+		$tabs['recommended'] = _x( 'Recommended', 'Plugin Installer' );
+		$tabs['favorites']   = _x( 'Favorites', 'Plugin Installer' );
 		if ( current_user_can( 'upload_plugins' ) ) {
 			// No longer a real tab. Here for filter compatibility.
 			// Gets skipped in get_views().
diff --git a/wp-admin/includes/plugin-install.php b/wp-admin/includes/plugin-install.php
index aca7d630c7..ba89d5ac24 100644
--- a/wp-admin/includes/plugin-install.php
+++ b/wp-admin/includes/plugin-install.php
@@ -333,6 +333,12 @@ function display_plugins_table() {
 		case 'install_plugins_recommended' :
 			echo '<p>' . __( 'These suggestions are based on the plugins you and other users have installed.' ) . '</p>';
 			break;
+		case 'install_plugins_beta' :
+			printf(
+				'<p>' . __( 'You are using a development version of WordPress. These feature plugins are also under development. <a href="%s">Learn more</a>.' ) . '</p>',
+				'https://make.wordpress.org/core/handbook/about/release-cycle/features-as-plugins/'
+			);
+			break;
 	}
 
 	?>
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 644e6bd60e..28d530b280 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.5-alpha-36296';
+$wp_version = '4.5-alpha-36297';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.