Changeset 52936

Timestamp:

03/15/2022 03:56:37 PM (4 years ago)

Author:

SergeyBiryukov

Message:

Plugins: Move the introduction text from install_dashboard() to display_plugins_table().

This brings some consistency to how the introduction is displayed for the Beta Testing, Featured, and Recommended tabs of the Add Plugins screen.

This commit also reorders the switch cases for the text in the same order as they are displayed.

Follow-up to [9141], [30889], [36297].

Props sabbir1991, kapilpaul.
Fixes #55389.

File:

• trunk/src/wp-admin/includes/plugin-install.php (modified) (3 diffs)

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

@@ -267 +267 @@
  */
 function install_dashboard() {
+        display_plugins_table();
         ?>
-        <p>
-                <?php
-                printf(
-                        /* translators: %s: https://wordpress.org/plugins/ */
-                        __( 'Plugins extend and expand the functionality of WordPress. You may automatically install plugins from the <a href="%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">
@@ -396 +386 @@
 
         switch ( current_filter() ) {
-                case 'install_plugins_favorites':
-                        if ( empty( $_GET['user'] ) && ! get_user_option( 'wporg_favorites' ) ) {
-                                return;
-                        }
-                        break;
-                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(
@@ -411 +393 @@
                         );
                         break;
-        }
-
+                case 'install_plugins_featured':
+                        printf(
+                                /* translators: %s: https://wordpress.org/plugins/ */
+                                '<p>' . __( 'Plugins extend and expand the functionality of WordPress. You may automatically install plugins from the <a href="%s">WordPress Plugin Directory</a> or upload a plugin in .zip format by clicking the button at the top of this page.' ) . '</p>',
+                                __( 'https://wordpress.org/plugins/' )
+                        );
+                        break;
+                case 'install_plugins_recommended':
+                        echo '<p>' . __( 'These suggestions are based on the plugins you and other users have installed.' ) . '</p>';
+                        break;
+                case 'install_plugins_favorites':
+                        if ( empty( $_GET['user'] ) && ! get_user_option( 'wporg_favorites' ) ) {
+                                return;
+                        }
+                        break;
+        }
         ?>
         <form id="plugin-filter" method="post">