From 42b03122b55e0c53633db02a997c9aac0713477e Mon Sep 17 00:00:00 2001
From: Dion Hulse <wordpress@dd32.id.au>
Date: Mon, 12 Mar 2018 01:57:31 +0000
Subject: [PATCH] Plugins: Add support for plugins having an `active_installs`
 value larger than 1 million. WordPress.org currently supports up to 5
 million, and with the growth of WordPress, it's expected that that upper
 bound will increase in the future.

Fixes #43193.

Built from https://develop.svn.wordpress.org/trunk@42829


git-svn-id: http://core.svn.wordpress.org/trunk@42659 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/class-wp-plugin-install-list-table.php | 6 +++++-
 wp-admin/includes/plugin-install.php                     | 6 +++++-
 wp-includes/version.php                                  | 2 +-
 3 files changed, 11 insertions(+), 3 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 ceb0558c05..07ee266e09 100644
--- a/wp-admin/includes/class-wp-plugin-install-list-table.php
+++ b/wp-admin/includes/class-wp-plugin-install-list-table.php
@@ -650,7 +650,11 @@ class WP_Plugin_Install_List_Table extends WP_List_Table {
 				<div class="column-downloaded">
 					<?php
 					if ( $plugin['active_installs'] >= 1000000 ) {
-						$active_installs_text = _x( '1+ Million', 'Active plugin installations' );
+						$active_installs_millions = floor( $plugin['active_installs'] / 1000000 );
+						$active_installs_text = sprintf(
+							_nx( '%s+ Million', '%s+ Million', 'Active plugin installations', $active_installs_millions ),
+							number_format_i18n( $active_installs_millions )
+						);
 					} elseif ( 0 == $plugin['active_installs'] ) {
 						$active_installs_text = _x( 'Less Than 10', 'Active plugin installations' );
 					} else {
diff --git a/wp-admin/includes/plugin-install.php b/wp-admin/includes/plugin-install.php
index c27998fe9e..445412d0f3 100644
--- a/wp-admin/includes/plugin-install.php
+++ b/wp-admin/includes/plugin-install.php
@@ -652,7 +652,11 @@ function install_plugin_information() {
 				<li><strong><?php _e( 'Active Installations:' ); ?></strong>
 										<?php
 										if ( $api->active_installs >= 1000000 ) {
-											_ex( '1+ Million', 'Active plugin installations' );
+											$active_installs_millions = floor( $api->active_installs / 1000000 );
+											printf(
+												_nx( '%s+ Million', '%s+ Million', 'Active plugin installations', $active_installs_millions ),
+												number_format_i18n( $active_installs_millions )
+											);
 										} elseif ( 0 == $api->active_installs ) {
 											_ex( 'Less Than 10', 'Active plugin installations' );
 										} else {
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 5c4d0e8243..4cf31c5f31 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.0-alpha-42828';
+$wp_version = '5.0-alpha-42829';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.