Changeset 60045

Timestamp:

03/18/2025 09:46:43 PM (4 weeks ago)

Author:

SergeyBiryukov

Message:

Coding Standards: Remove leading and trailing spaces in URLs on the Menus screen.

Follow-up to [42343].

Props kkmuffme.
Fixes #62978.

File:

• trunk/src/wp-admin/nav-menus.php (modified) (3 diffs)

trunk/src/wp-admin/nav-menus.php

@@ -880 +880 @@
                                 <?php if ( isset( $menu_locations[ $_location ] ) && 0 !== $menu_locations[ $_location ] ) : ?>
                                 <span class="locations-edit-menu-link">
-                                    <a href="
                                     <?php
-                                    echo esc_url(
-                                        add_query_arg(
-                                            array(
-                                                'action' => 'edit',
-                                                'menu'   => $menu_locations[ $_location ],
-                                            ),
-                                            admin_url( 'nav-menus.php' )
-                                        )
+                                    printf(
+                                        '<a href="%1$s">
+                                            <span aria-hidden="true">%2$s</span>
+                                            <span class="screen-reader-text">%3$s</span>
+                                        </a>',
+                                        esc_url(
+                                            add_query_arg(
+                                                array(
+                                                    'action' => 'edit',
+                                                    'menu' => $menu_locations[ $_location ],
+                                                ),
+                                                admin_url( 'nav-menus.php' )
+                                            )
+                                        ),
+                                        _x( 'Edit', 'menu' ),
+                                        /* translators: Hidden accessibility text. */
+                                        __( 'Edit selected menu' )
                                     );
                                     ?>
-                                    ">
-                                        <span aria-hidden="true"><?php _ex( 'Edit', 'menu' ); ?></span><span class="screen-reader-text">
-                                            <?php
-                                            /* translators: Hidden accessibility text. */
-                                            _e( 'Edit selected menu' );
-                                            ?>
-                                        </span>
-                                    </a>
                                 </span>
                                 <?php endif; ?>
                                 <span class="locations-add-menu-link">
-                                    <a href="
                                     <?php
-                                    echo esc_url(
-                                        add_query_arg(
-                                            array(
-                                                'action' => 'edit',
-                                                'menu'   => 0,
-                                                'use-location' => $_location,
-                                            ),
-                                            admin_url( 'nav-menus.php' )
-                                        )
+                                    printf(
+                                        '<a href="%1$s">%2$s</a>',
+                                        esc_url(
+                                            add_query_arg(
+                                                array(
+                                                    'action' => 'edit',
+                                                    'menu' => 0,
+                                                    'use-location' => $_location,
+                                                ),
+                                                admin_url( 'nav-menus.php' )
+                                            )
+                                        ),
+                                        _x( 'Use new menu', 'menu' )
                                     );
                                     ?>
-                                    ">
-                                        <?php _ex( 'Use new menu', 'menu' ); ?>
-                                    </a>
                                 </span>
                             </div><!-- .locations-row-links -->
@@ -1204 +1204 @@
 
                                             if ( isset( $menu_locations[ $location ] )
-                                                    && 0 !== $nav_menu_selected_id
-                                                    && $menu_locations[ $location ] === $nav_menu_selected_id
+                                                && 0 !== $nav_menu_selected_id
+                                                && $menu_locations[ $location ] === $nav_menu_selected_id
                                             ) {
                                                     $checked = true;
@@ -1242 +1242 @@
                                 <?php if ( $add_new_screen ) : ?>
                                 <span class="cancel-action">
-                                    <a class="submitcancel cancellation menu-cancel" href="<?php echo esc_url( admin_url( 'nav-menus.php' ) ); ?>"><?php _e( 'Cancel' ); ?></a>
+                                    <?php
+                                    printf(
+                                        '<a class="submitcancel cancellation menu-cancel" href="%1$s">%2$s</a>',
+                                        esc_url( admin_url( 'nav-menus.php' ) ),
+                                        __( 'Cancel' )
+                                    );
+                                    ?>
                                 </span><!-- END .cancel-action -->
                                 <?php else : ?>
                                 <span class="delete-action">
-                                    <a class="submitdelete deletion menu-delete" href="
                                     <?php
-                                    echo esc_url(
-                                        wp_nonce_url(
-                                            add_query_arg(
-                                                array(
-                                                    'action' => 'delete',
-                                                    'menu' => $nav_menu_selected_id,
+                                    printf(
+                                        '<a class="submitdelete deletion menu-delete" href="%1$s">%2$s</a>',
+                                        esc_url(
+                                            wp_nonce_url(
+                                                add_query_arg(
+                                                    array(
+                                                        'action' => 'delete',
+                                                        'menu' => $nav_menu_selected_id,
+                                                    ),
+                                                    admin_url( 'nav-menus.php' )
                                                 ),
-                                                admin_url( 'nav-menus.php' )
-                                            ),
-                                            'delete-nav_menu-' . $nav_menu_selected_id
-                                        )
+                                                'delete-nav_menu-' . $nav_menu_selected_id
+                                            )
+                                        ),
+                                        __( 'Delete Menu' )
                                     );
                                     ?>
-                                    "><?php _e( 'Delete Menu' ); ?></a>
                                 </span><!-- END .delete-action -->
                                 <?php endif; ?>