Ticket #40186: 40186.diff

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

@@ -233 +233 @@
 function install_dashboard() {
         ?>
         <p><?php printf( __( 'Plugins extend and expand the functionality of WordPress. You may automatically install plugins from the <a href="%1$s">WordPress Plugin Directory</a> or upload a plugin in .zip format by clicking the button at the top of this page.' ), __( 'https://wordpress.org/plugins/' ) ); ?></p>
-
-        <?php display_plugins_table(); ?>
-
-        <div class="plugins-popular-tags-wrapper">
-        <h2><?php _e( 'Popular tags' ) ?></h2>
-        <p><?php _e( 'You may also browse based on the most popular tags in the Plugin Directory:' ) ?></p>
         <?php
-
-        $api_tags = install_popular_tags();
-
-        echo '<p class="popular-tags">';
-        if ( is_wp_error($api_tags) ) {
-                echo $api_tags->get_error_message();
-        } else {
-                //Set up the tags in a way which can be interpreted by wp_generate_tag_cloud()
-                $tags = array();
-                foreach ( (array) $api_tags as $tag ) {
-                        $url = self_admin_url( 'plugin-install.php?tab=search&type=tag&s=' . urlencode( $tag['name'] ) );
-                        $data = array(
-                                'link' => esc_url( $url ),
-                                'name' => $tag['name'],
-                                'slug' => $tag['slug'],
-                                'id' => sanitize_title_with_dashes( $tag['name'] ),
-                                'count' => $tag['count']
-                        );
-                        $tags[ $tag['name'] ] = (object) $data;
-                }
-                echo wp_generate_tag_cloud($tags, array( 'single_text' => __('%s plugin'), 'multiple_text' => __('%s plugins') ) );
-        }
-        echo '</p><br class="clear" /></div>';
+        display_plugins_table();
 }
 
 /**

src/wp-admin/plugin-install.php

@@ -87 +87 @@
 'id'            => 'adding-plugins',
 'title'         => __('Adding Plugins'),
 'content'       =>
-        '<p>' . __('If you know what you&#8217;re looking for, Search is your best bet. The Search screen has options to search the WordPress Plugin Directory for a particular Term, Author, or Tag. You can also search the directory by selecting popular tags. Tags in larger type mean more plugins have been labeled with that tag.') . '</p>' .
+        '<p>' . __( 'If you know what you&#8217;re looking for, Search is your best bet. The Search screen has options to search the WordPress Plugin Directory for a particular Term, Author, or Tag.' ) . '</p>' .
         '<p>' . __( 'If you just want to get an idea of what&#8217;s available, you can browse Featured and Popular plugins by using the links above the plugins list. These sections rotate regularly.' ) . '</p>' .
         '<p>' . __( 'You can also browse a user&#8217;s favorite plugins, by using the Favorites link above the plugins list and entering their WordPress.org username.' ) . '</p>' .
         '<p>' . __( 'If you want to install a plugin that you&#8217;ve downloaded elsewhere, click the Upload Plugin button above the plugins list. You will be prompted to upload the .zip package, and once uploaded, you can activate the new plugin.' ) . '</p>'