Ticket #31865: 31865.diff

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

@@ -93 +93 @@
                  * Filter tabs not associated with a menu item on the Plugin Install screen.
                  *
                  * @since 2.7.0
                  *
                  * @param array $nonmenu_tabs The tabs that don't have a Menu item on the Plugin Install screen.
                  */
                 $nonmenu_tabs = apply_filters( 'install_plugins_nonmenu_tabs', $nonmenu_tabs );
 
                 // If a non-valid menu tab has been selected, And it's not a non-menu action.
                 if ( empty( $tab ) || ( !isset( $tabs[ $tab ] ) && !in_array( $tab, (array) $nonmenu_tabs ) ) )
                         $tab = key( $tabs );
 
                 $args = array(
                         'page' => $paged,
                         'per_page' => $per_page,
-                        'fields' => array( 'last_updated' => true, 'downloaded' => true, 'icons' => true ),
+                        'fields' => array(
+                                'last_updated' => true,
+                                'icons' => true,
+                                'active_installs' => true
+                        ),
                         // Send the locale and installed plugin slugs to the API so it can provide context-sensitive results.
                         'locale' => get_locale(),
                         'installed_plugins' => $this->get_installed_plugin_slugs(),
                 );
 
                 switch ( $tab ) {
                         case 'search':
                                 $type = isset( $_REQUEST['type'] ) ? wp_unslash( $_REQUEST['type'] ) : 'term';
                                 $term = isset( $_REQUEST['s'] ) ? wp_unslash( $_REQUEST['s'] ) : '';
 
                                 switch ( $type ) {
                                         case 'tag':
                                                 $args['tag'] = sanitize_title_with_dashes( $term );
                                                 break;
                                         case 'term':
@@ -466 +470 @@
                                         <p><?php echo $description; ?></p>
                                         <p class="authors"><?php echo $author; ?></p>
                                 </div>
                         </div>
                         <div class="plugin-card-bottom">
                                 <div class="vers column-rating">
                                         <?php wp_star_rating( array( 'rating' => $plugin['rating'], 'type' => 'percent', 'number' => $plugin['num_ratings'] ) ); ?>
                                         <span class="num-ratings">(<?php echo number_format_i18n( $plugin['num_ratings'] ); ?>)</span>
                                 </div>
                                 <div class="column-updated">
                                         <strong><?php _e( 'Last Updated:' ); ?></strong> <span title="<?php echo esc_attr( date_i18n( $date_format, $last_updated_timestamp ) ); ?>">
                                                 <?php printf( __( '%s ago' ), human_time_diff( $last_updated_timestamp ) ); ?>
                                         </span>
                                 </div>
                                 <div class="column-downloaded">
-                                        <?php echo sprintf( _n( '%s download', '%s downloads', $plugin['downloaded'] ), number_format_i18n( $plugin['downloaded'] ) ); ?>
+                                        <?php
+                                        if ( $plugin['active_installs'] >= 1000000 ) {
+                                                $active_installs_text = _x( '1+ Million', 'Active plugin installs' );
+                                        } else {
+                                                $active_installs_text = number_format_i18n( $plugin['active_installs'] ) . '+';
+                                        }
+                                        printf( __( '%s Active Installs' ), $active_installs_text );
+                                        ?>
                                 </div>
                                 <div class="column-compatibility">
                                         <?php
                                         if ( ! empty( $plugin['tested'] ) && version_compare( substr( $GLOBALS['wp_version'], 0, strlen( $plugin['tested'] ) ), $plugin['tested'], '>' ) ) {
                                                 echo '<span class="compatibility-untested">' . __( 'Untested with your version of WordPress' ) . '</span>';
                                         } elseif ( ! empty( $plugin['requires'] ) && version_compare( substr( $GLOBALS['wp_version'], 0, strlen( $plugin['requires'] ) ), $plugin['requires'], '<' ) ) {
                                                 echo '<span class="compatibility-incompatible">' . __( '<strong>Incompatible</strong> with your version of WordPress' ) . '</span>';
                                         } else {
                                                 echo '<span class="compatibility-compatible">' . __( '<strong>Compatible</strong> with your version of WordPress' ) . '</span>';
                                         }
                                         ?>
                                 </div>
                         </div>
                 </div>
                 <?php

src/wp-admin/includes/plugin-install.php

@@ -336 +336 @@
 /**
  * Display plugin information in dialog box form.
  *
  * @since 2.7.0
  */
 function install_plugin_information() {
         global $tab;
 
         if ( empty( $_REQUEST['plugin'] ) ) {
                 return;
         }
 
         $api = plugins_api( 'plugin_information', array(
                 'slug' => wp_unslash( $_REQUEST['plugin'] ),
                 'is_ssl' => is_ssl(),
-                'fields' => array( 'banners' => true, 'reviews' => true )
+                'fields' => array(
+                        'banners' => true,
+                        'reviews' => true,
+                        'downloaded' => false,
+                        'active_installs' => true
+                )
         ) );
 
         if ( is_wp_error( $api ) ) {
                 wp_die( $api );
         }
 
         $plugins_allowedtags = array(
                 'a' => array( 'href' => array(), 'title' => array(), 'target' => array() ),
                 'abbr' => array( 'title' => array() ), 'acronym' => array( 'title' => array() ),
                 'code' => array(), 'pre' => array(), 'em' => array(), 'strong' => array(),
                 'div' => array( 'class' => array() ), 'span' => array( 'class' => array() ),
                 'p' => array(), 'ul' => array(), 'ol' => array(), 'li' => array(),
                 'h1' => array(), 'h2' => array(), 'h3' => array(), 'h4' => array(), 'h5' => array(), 'h6' => array(),
                 'img' => array( 'src' => array(), 'class' => array(), 'alt' => array() )
         );
@@ -446 +451 @@
         <div id="<?php echo $_tab; ?>-content" class='<?php echo $_with_banner; ?>'>
         <div class="fyi">
                 <ul>
                 <?php if ( ! empty( $api->version ) ) { ?>
                         <li><strong><?php _e( 'Version:' ); ?></strong> <?php echo $api->version; ?></li>
                 <?php } if ( ! empty( $api->author ) ) { ?>
                         <li><strong><?php _e( 'Author:' ); ?></strong> <?php echo links_add_target( $api->author, '_blank' ); ?></li>
                 <?php } if ( ! empty( $api->last_updated ) ) { ?>
                         <li><strong><?php _e( 'Last Updated:' ); ?></strong> <span title="<?php echo esc_attr( date_i18n( $date_format, $last_updated_timestamp ) ); ?>">
                                 <?php printf( __( '%s ago' ), human_time_diff( $last_updated_timestamp ) ); ?>
                         </span></li>
                 <?php } if ( ! empty( $api->requires ) ) { ?>
                         <li><strong><?php _e( 'Requires WordPress Version:' ); ?></strong> <?php printf( __( '%s or higher' ), $api->requires ); ?></li>
                 <?php } if ( ! empty( $api->tested ) ) { ?>
                         <li><strong><?php _e( 'Compatible up to:' ); ?></strong> <?php echo $api->tested; ?></li>
-                <?php } if ( ! empty( $api->downloaded ) ) { ?>
-                        <li><strong><?php _e( 'Downloaded:' ); ?></strong> <?php printf( _n( '%s time', '%s times', $api->downloaded ), number_format_i18n( $api->downloaded ) ); ?></li>
+                <?php } if ( ! empty( $api->active_installs ) ) { ?>
+                        <li><strong><?php _e( 'Active Installs:' ); ?></strong> <?php
+                                if ( $api->active_installs >= 1000000 ) {
+                                        _ex( '1+ Million', 'Active plugin installs' );
+                                } else {
+                                        echo number_format_i18n( $api->active_installs ) . '+';
+                                }
+                        ?></li>
                 <?php } if ( ! empty( $api->slug ) && empty( $api->external ) ) { ?>
                         <li><a target="_blank" href="https://wordpress.org/plugins/<?php echo $api->slug; ?>/"><?php _e( 'WordPress.org Plugin Page &#187;' ); ?></a></li>
                 <?php } if ( ! empty( $api->homepage ) ) { ?>
                         <li><a target="_blank" href="<?php echo esc_url( $api->homepage ); ?>"><?php _e( 'Plugin Homepage &#187;' ); ?></a></li>
                 <?php } if ( ! empty( $api->donate_link ) && empty( $api->contributors ) ) { ?>
                         <li><a target="_blank" href="<?php echo esc_url( $api->donate_link ); ?>"><?php _e( 'Donate to this plugin &#187;' ); ?></a></li>
                 <?php } ?>
                 </ul>
                 <?php if ( ! empty( $api->rating ) ) { ?>
                 <h3><?php _e( 'Average Rating' ); ?></h3>
                 <?php wp_star_rating( array( 'rating' => $api->rating, 'type' => 'percent', 'number' => $api->num_ratings ) ); ?>
                 <small><?php printf( _n( '(based on %s rating)', '(based on %s ratings)', $api->num_ratings ), number_format_i18n( $api->num_ratings ) ); ?></small>
                 <?php }
 
                 if ( ! empty( $api->ratings ) && array_sum( (array) $api->ratings ) > 0 ) {