From 242931964840c8ba3aad469e8f3912d42475376e Mon Sep 17 00:00:00 2001
From: "Stephen A. Bernhardt" <sabernhardt@yahoo.com>
Date: Tue, 3 Feb 2026 16:26:01 -0600
Subject: [PATCH] Create text string for invalid menu ID, and add `id` and
 `aria-describedby` for checkboxes

---
 src/wp-admin/nav-menus.php | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/wp-admin/nav-menus.php b/src/wp-admin/nav-menus.php
index b5328c4b62bb4..8da675c9a2375 100644
--- a/src/wp-admin/nav-menus.php
+++ b/src/wp-admin/nav-menus.php
@@ -1200,7 +1200,8 @@ function wp_nav_menu_max_depth( $classes ) {
 										<legend class="menu-settings-group-name howto"><?php _e( 'Display location' ); ?></legend>
 										<?php
 										foreach ( $locations as $location => $description ) :
-											$checked = false;
+											$checked      = false;
+											$location_set = '';
 
 											if ( isset( $menu_locations[ $location ] )
 												&& 0 !== $nav_menu_selected_id
@@ -1208,17 +1209,23 @@ function wp_nav_menu_max_depth( $classes ) {
 											) {
 													$checked = true;
 											}
+
+											if ( ! empty( $menu_locations[ $location ] )
+												&& $menu_locations[ $location ] !== $nav_menu_selected_id
+											) {
+													$location_set = ' aria-describedby="theme-location-set-' . esc_attr( $location ) . '"';
+											}
 											?>
 											<div class="menu-settings-input checkbox-input">
-												<input type="checkbox"<?php checked( $checked ); ?> name="menu-locations[<?php echo esc_attr( $location ); ?>]" id="locations-<?php echo esc_attr( $location ); ?>" value="<?php echo esc_attr( $nav_menu_selected_id ); ?>" />
+												<input type="checkbox"<?php checked( $checked ); ?> name="menu-locations[<?php echo esc_attr( $location ); ?>]" id="locations-<?php echo esc_attr( $location ); ?>" value="<?php echo esc_attr( $nav_menu_selected_id ); ?>"<?php echo $location_set; ?> />
 												<label for="locations-<?php echo esc_attr( $location ); ?>"><?php echo $description; ?></label>
-												<?php if ( ! empty( $menu_locations[ $location ] ) && $menu_locations[ $location ] !== $nav_menu_selected_id ) : ?>
-													<span class="theme-location-set">
+												<?php if ( '' !== $location_set ) : ?>
+													<span class="theme-location-set" id="theme-location-set-<?php echo esc_attr( $location ); ?>">
 													<?php
 														printf(
 															/* translators: %s: Menu name. */
 															_x( '(Currently set to: %s)', 'menu location' ),
-															wp_get_nav_menu_object( $menu_locations[ $location ] )->name
+															is_nav_menu( $menu_locations[ $location ] ) ? wp_get_nav_menu_object( $menu_locations[ $location ] )->name : __( 'an invalid menu ID' )
 														);
 													?>
 													</span>