From 1033c6c05ea96b48b995a0c2192121af2f55c372 Mon Sep 17 00:00:00 2001
From: wildworks <wildworks@git.wordpress.org>
Date: Mon, 22 Dec 2025 10:42:35 +0000
Subject: [PATCH] Widgets: Insert widgets into the selected sidebar correctly
 in accessibility mode.

Renames variables to resolve conflict with outer scope variables, fixing widget placement in selected sidebars.

Props joedolson, sabernhardt, vybiral, wildworks.
Fixes #64380.
Built from https://develop.svn.wordpress.org/trunk@61399


git-svn-id: http://core.svn.wordpress.org/trunk@60711 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/widgets-form.php | 6 +++---
 wp-includes/version.php   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/wp-admin/widgets-form.php b/wp-admin/widgets-form.php
index cabbb80bb4..cde09ca47c 100644
--- a/wp-admin/widgets-form.php
+++ b/wp-admin/widgets-form.php
@@ -187,9 +187,9 @@ if ( isset( $_POST['savewidget'] ) || isset( $_POST['removewidget'] ) ) {
 
 	// Remove old position.
 	if ( ! isset( $_POST['delete_widget'] ) ) {
-		foreach ( $sidebars_widgets as $sidebar_id => $sidebar ) {
-			if ( is_array( $sidebar ) ) {
-				$sidebars_widgets[ $sidebar_id ] = array_diff( $sidebar, array( $widget_id ) );
+		foreach ( $sidebars_widgets as $sidebar_widget_id => $sidebar_widget ) {
+			if ( is_array( $sidebar_widget ) ) {
+				$sidebars_widgets[ $sidebar_widget_id ] = array_diff( $sidebar_widget, array( $widget_id ) );
 			}
 		}
 
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 056fa2c7e6..20dbf719e3 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '7.0-alpha-61398';
+$wp_version = '7.0-alpha-61399';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.