diff -r 7b1b88e27a20 -r 48c4eec2b7e6 wp/wp-admin/widgets-form.php
--- a/wp/wp-admin/widgets-form.php	Thu Sep 29 08:06:27 2022 +0200
+++ b/wp/wp-admin/widgets-form.php	Fri Sep 05 18:40:08 2025 +0200
@@ -68,8 +68,8 @@
 
 get_current_screen()->set_help_sidebar(
 	'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/article/appearance-widgets-screen/">Documentation on Widgets</a>' ) . '</p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/">Support</a>' ) . '</p>'
+	'<p>' . __( '<a href="https://wordpress.org/documentation/article/appearance-widgets-screen-classic-editor/">Documentation on Widgets</a>' ) . '</p>' .
+	'<p>' . __( '<a href="https://wordpress.org/support/forums/">Support forums</a>' ) . '</p>'
 );
 
 // These are the widgets grouped by sidebar.
@@ -272,7 +272,8 @@
 	$width = ' style="width:' . max( $control['width'], 350 ) . 'px"';
 	$key   = isset( $_GET['key'] ) ? (int) $_GET['key'] : 0;
 
-	require_once ABSPATH . 'wp-admin/admin-header.php'; ?>
+	require_once ABSPATH . 'wp-admin/admin-header.php';
+	?>
 	<div class="wrap">
 	<h1><?php echo esc_html( $title ); ?></h1>
 	<div class="editwidget"<?php echo $width; ?>>
@@ -300,7 +301,7 @@
 	<?php
 	foreach ( $wp_registered_sidebars as $sbname => $sbvalue ) {
 		echo "\t\t<tr><td><label><input type='radio' name='sidebar' value='" . esc_attr( $sbname ) . "'" . checked( $sbname, $sidebar, false ) . " /> $sbvalue[name]</label></td><td>";
-		if ( 'wp_inactive_widgets' === $sbname || 'orphaned_widgets' === substr( $sbname, 0, 16 ) ) {
+		if ( 'wp_inactive_widgets' === $sbname || str_starts_with( $sbname, 'orphaned_widgets' ) ) {
 			echo '&nbsp;';
 		} else {
 			if ( ! isset( $sidebars_widgets[ $sbname ] ) || ! is_array( $sidebars_widgets[ $sbname ] ) ) {
@@ -309,7 +310,7 @@
 			} else {
 				$j = count( $sidebars_widgets[ $sbname ] );
 				if ( isset( $_GET['addnew'] ) || ! in_array( $widget_id, $sidebars_widgets[ $sbname ], true ) ) {
-					$j++;
+					++$j;
 				}
 			}
 			$selected = '';
@@ -332,7 +333,7 @@
 	<div class="widget-control-actions">
 		<div class="alignleft">
 			<?php if ( ! isset( $_GET['addnew'] ) ) : ?>
-				<input type="submit" name="removewidget" id="removewidget" class="button-link button-link-delete widget-control-remove" value="<?php _e( 'Delete' ); ?>" />
+				<input type="submit" name="removewidget" id="removewidget" class="button-link button-link-delete widget-control-remove" value="<?php esc_attr_e( 'Delete' ); ?>" />
 				<span class="widget-control-close-wrapper">
 					| <a href="widgets.php" class="button-link widget-control-close"><?php _e( 'Cancel' ); ?></a>
 				</span>
@@ -402,14 +403,28 @@
 
 <hr class="wp-header-end">
 
-<?php if ( isset( $_GET['message'] ) && isset( $messages[ $_GET['message'] ] ) ) { ?>
-<div id="message" class="updated notice is-dismissible"><p><?php echo $messages[ $_GET['message'] ]; ?></p></div>
-<?php } ?>
-<?php if ( isset( $_GET['error'] ) && isset( $errors[ $_GET['error'] ] ) ) { ?>
-<div id="message" class="error"><p><?php echo $errors[ $_GET['error'] ]; ?></p></div>
-<?php } ?>
+<?php
+if ( isset( $_GET['message'] ) && isset( $messages[ $_GET['message'] ] ) ) {
+	wp_admin_notice(
+		$messages[ $_GET['message'] ],
+		array(
+			'id'                 => 'message',
+			'additional_classes' => array( 'updated' ),
+			'dismissible'        => true,
+		)
+	);
+}
+if ( isset( $_GET['error'] ) && isset( $errors[ $_GET['error'] ] ) ) {
+	wp_admin_notice(
+		$errors[ $_GET['error'] ],
+		array(
+			'id'                 => 'message',
+			'additional_classes' => array( 'error' ),
+			'dismissible'        => true,
+		)
+	);
+}
 
-<?php
 /**
  * Fires before the Widgets administration page content loads.
  *
@@ -423,7 +438,12 @@
 	<div id="available-widgets" class="widgets-holder-wrap">
 		<div class="sidebar-name">
 			<button type="button" class="handlediv hide-if-no-js" aria-expanded="true">
-				<span class="screen-reader-text"><?php _e( 'Available Widgets' ); ?></span>
+				<span class="screen-reader-text">
+					<?php
+					/* translators: Hidden accessibility text. */
+					_e( 'Available Widgets' );
+					?>
+				</span>
 				<span class="toggle-indicator" aria-hidden="true"></span>
 			</button>
 			<h2><?php _e( 'Available Widgets' ); ?> <span id="removing-widget"><?php _ex( 'Deactivate', 'removing-widget' ); ?> <span></span></span></h2>
@@ -444,7 +464,7 @@
 
 $theme_sidebars = array();
 foreach ( $wp_registered_sidebars as $sidebar => $registered_sidebar ) {
-	if ( false !== strpos( $registered_sidebar['class'], 'inactive-sidebar' ) || 'orphaned_widgets' === substr( $sidebar, 0, 16 ) ) {
+	if ( str_contains( $registered_sidebar['class'], 'inactive-sidebar' ) || str_starts_with( $sidebar, 'orphaned_widgets' ) ) {
 		$wrap_class = 'widgets-holder-wrap';
 		if ( ! empty( $registered_sidebar['class'] ) ) {
 			$wrap_class .= ' ' . $registered_sidebar['class'];
@@ -458,7 +478,7 @@
 
 				<?php if ( $is_inactive_widgets ) { ?>
 				<div class="remove-inactive-widgets">
-					<form action="" method="post">
+					<form method="post">
 						<p>
 							<?php
 							$attributes = array( 'id' => 'inactive-widgets-control-remove' );
@@ -534,7 +554,7 @@
 	</div>
 	<?php
 
-	$i++;
+	++$i;
 }
 
 ?>