Skip to content

Commit 392867a

Browse files
Coding Standards: Remove leading and trailing spaces in URLs on the Menus screen.
Follow-up to [42343]. Props kkmuffme. Fixes #62978. git-svn-id: https://develop.svn.wordpress.org/trunk@60045 602fd350-edb4-49c9-b593-d223f7449a82
1 parent 7607cbc commit 392867a

File tree

1 file changed

+53
-45
lines changed

1 file changed

+53
-45
lines changed

src/wp-admin/nav-menus.php

Lines changed: 53 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -879,45 +879,45 @@ function wp_nav_menu_max_depth( $classes ) {
879879
<div class="locations-row-links">
880880
<?php if ( isset( $menu_locations[ $_location ] ) && 0 !== $menu_locations[ $_location ] ) : ?>
881881
<span class="locations-edit-menu-link">
882-
<a href="
883882
<?php
884-
echo esc_url(
885-
add_query_arg(
886-
array(
887-
'action' => 'edit',
888-
'menu' => $menu_locations[ $_location ],
889-
),
890-
admin_url( 'nav-menus.php' )
891-
)
883+
printf(
884+
'<a href="%1$s">
885+
<span aria-hidden="true">%2$s</span>
886+
<span class="screen-reader-text">%3$s</span>
887+
</a>',
888+
esc_url(
889+
add_query_arg(
890+
array(
891+
'action' => 'edit',
892+
'menu' => $menu_locations[ $_location ],
893+
),
894+
admin_url( 'nav-menus.php' )
895+
)
896+
),
897+
_x( 'Edit', 'menu' ),
898+
/* translators: Hidden accessibility text. */
899+
__( 'Edit selected menu' )
892900
);
893901
?>
894-
">
895-
<span aria-hidden="true"><?php _ex( 'Edit', 'menu' ); ?></span><span class="screen-reader-text">
896-
<?php
897-
/* translators: Hidden accessibility text. */
898-
_e( 'Edit selected menu' );
899-
?>
900-
</span>
901-
</a>
902902
</span>
903903
<?php endif; ?>
904904
<span class="locations-add-menu-link">
905-
<a href="
906905
<?php
907-
echo esc_url(
908-
add_query_arg(
909-
array(
910-
'action' => 'edit',
911-
'menu' => 0,
912-
'use-location' => $_location,
913-
),
914-
admin_url( 'nav-menus.php' )
915-
)
906+
printf(
907+
'<a href="%1$s">%2$s</a>',
908+
esc_url(
909+
add_query_arg(
910+
array(
911+
'action' => 'edit',
912+
'menu' => 0,
913+
'use-location' => $_location,
914+
),
915+
admin_url( 'nav-menus.php' )
916+
)
917+
),
918+
_x( 'Use new menu', 'menu' )
916919
);
917920
?>
918-
">
919-
<?php _ex( 'Use new menu', 'menu' ); ?>
920-
</a>
921921
</span>
922922
</div><!-- .locations-row-links -->
923923
</td><!-- .menu-location-menus -->
@@ -1203,8 +1203,8 @@ function wp_nav_menu_max_depth( $classes ) {
12031203
$checked = false;
12041204

12051205
if ( isset( $menu_locations[ $location ] )
1206-
&& 0 !== $nav_menu_selected_id
1207-
&& $menu_locations[ $location ] === $nav_menu_selected_id
1206+
&& 0 !== $nav_menu_selected_id
1207+
&& $menu_locations[ $location ] === $nav_menu_selected_id
12081208
) {
12091209
$checked = true;
12101210
}
@@ -1241,26 +1241,34 @@ function wp_nav_menu_max_depth( $classes ) {
12411241

12421242
<?php if ( $add_new_screen ) : ?>
12431243
<span class="cancel-action">
1244-
<a class="submitcancel cancellation menu-cancel" href="<?php echo esc_url( admin_url( 'nav-menus.php' ) ); ?>"><?php _e( 'Cancel' ); ?></a>
1244+
<?php
1245+
printf(
1246+
'<a class="submitcancel cancellation menu-cancel" href="%1$s">%2$s</a>',
1247+
esc_url( admin_url( 'nav-menus.php' ) ),
1248+
__( 'Cancel' )
1249+
);
1250+
?>
12451251
</span><!-- END .cancel-action -->
12461252
<?php else : ?>
12471253
<span class="delete-action">
1248-
<a class="submitdelete deletion menu-delete" href="
12491254
<?php
1250-
echo esc_url(
1251-
wp_nonce_url(
1252-
add_query_arg(
1253-
array(
1254-
'action' => 'delete',
1255-
'menu' => $nav_menu_selected_id,
1255+
printf(
1256+
'<a class="submitdelete deletion menu-delete" href="%1$s">%2$s</a>',
1257+
esc_url(
1258+
wp_nonce_url(
1259+
add_query_arg(
1260+
array(
1261+
'action' => 'delete',
1262+
'menu' => $nav_menu_selected_id,
1263+
),
1264+
admin_url( 'nav-menus.php' )
12561265
),
1257-
admin_url( 'nav-menus.php' )
1258-
),
1259-
'delete-nav_menu-' . $nav_menu_selected_id
1260-
)
1266+
'delete-nav_menu-' . $nav_menu_selected_id
1267+
)
1268+
),
1269+
__( 'Delete Menu' )
12611270
);
12621271
?>
1263-
"><?php _e( 'Delete Menu' ); ?></a>
12641272
</span><!-- END .delete-action -->
12651273
<?php endif; ?>
12661274

0 commit comments

Comments
 (0)