Changeset 45536

Timestamp:

06/14/2019 12:28:54 AM (5 years ago)

Author:

SergeyBiryukov

Message:

Administration: Adjust code for "Manage widgets or menus" item on "Welcome to WordPress" panel to avoid an extra space after [42343].

Props Presskopp, davidbaumwald.
Fixes #47536.

File:

• trunk/src/wp-admin/includes/dashboard.php (modified) (2 diffs)

trunk/src/wp-admin/includes/dashboard.php

@@ -1718 +1718 @@
         <h3><?php _e( 'More Actions' ); ?></h3>
         <ul>
-        <?php if ( current_theme_supports( 'widgets' ) || current_theme_supports( 'menus' ) ) : ?>
-            <li><div class="welcome-icon welcome-widgets-menus">
-            <?php
+        <?php
+        if ( current_theme_supports( 'widgets' ) || current_theme_supports( 'menus' ) ) :
             if ( current_theme_supports( 'widgets' ) && current_theme_supports( 'menus' ) ) {
-                printf(
+                $widgets_menus_link = sprintf(
                     __( 'Manage <a href="%1$s">widgets</a> or <a href="%2$s">menus</a>' ),
                     admin_url( 'widgets.php' ),
@@ -1728 +1727 @@
                 );
             } elseif ( current_theme_supports( 'widgets' ) ) {
-                echo '<a href="' . admin_url( 'widgets.php' ) . '">' . __( 'Manage widgets' ) . '</a>';
+                $widgets_menus_link = '<a href="' . admin_url( 'widgets.php' ) . '">' . __( 'Manage widgets' ) . '</a>';
             } else {
-                echo '<a href="' . admin_url( 'nav-menus.php' ) . '">' . __( 'Manage menus' ) . '</a>';
+                $widgets_menus_link = '<a href="' . admin_url( 'nav-menus.php' ) . '">' . __( 'Manage menus' ) . '</a>';
             }
             ?>
-            </div></li>
+            <li><div class="welcome-icon welcome-widgets-menus"><?php echo $widgets_menus_link; ?></div></li>
         <?php endif; ?>
         <?php if ( current_user_can( 'manage_options' ) ) : ?>