From d7ecafd85823030b65df8ffb08749bfad3f6b952 Mon Sep 17 00:00:00 2001
From: Rakesh Falke <rakesh.falke@xecurify.com>
Date: Wed, 8 Apr 2026 16:12:34 +0530
Subject: [PATCH 1/4] Settings API: Add ID attributes to section title
 headings.

---
 src/wp-admin/includes/template.php  | 2 +-
 src/wp-admin/options-discussion.php | 2 +-
 src/wp-admin/options-media.php      | 6 +++---
 src/wp-admin/options-permalink.php  | 4 ++--
 src/wp-admin/options-writing.php    | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/wp-admin/includes/template.php b/src/wp-admin/includes/template.php
index 6680bca89691a..5f283761e2880 100644
--- a/src/wp-admin/includes/template.php
+++ b/src/wp-admin/includes/template.php
@@ -1780,7 +1780,7 @@ function do_settings_sections( $page ) {
 		}
 
 		if ( $section['title'] ) {
-			echo "<h2>{$section['title']}</h2>\n";
+			echo '<h2 id="' . esc_attr( $section['id'] ) . '">' . $section['title'] . "</h2>\n";
 		}
 
 		if ( $section['callback'] ) {
diff --git a/src/wp-admin/options-discussion.php b/src/wp-admin/options-discussion.php
index 0c350475fe176..3fe231286831e 100644
--- a/src/wp-admin/options-discussion.php
+++ b/src/wp-admin/options-discussion.php
@@ -211,7 +211,7 @@
 <?php do_settings_fields( 'discussion', 'default' ); ?>
 </table>
 
-<h2 class="title"><?php _e( 'Avatars' ); ?></h2>
+<h2 id="avatars" class="title"><?php _e( 'Avatars' ); ?></h2>
 
 <p><?php _e( 'An avatar is an image that can be associated with a user across multiple websites. In this area, you can choose to display avatars of users who interact with the site.' ); ?></p>
 
diff --git a/src/wp-admin/options-media.php b/src/wp-admin/options-media.php
index 81ebc9223f543..973fc063637de 100644
--- a/src/wp-admin/options-media.php
+++ b/src/wp-admin/options-media.php
@@ -52,7 +52,7 @@
 <form action="options.php" method="post">
 <?php settings_fields( 'media' ); ?>
 
-<h2 class="title"><?php _e( 'Image sizes' ); ?></h2>
+<h2 id="image-sizes" class="title"><?php _e( 'Image sizes' ); ?></h2>
 <p><?php _e( 'The sizes listed below determine the maximum dimensions in pixels to use when adding an image to the Media Library.' ); ?></p>
 
 <table class="form-table" role="presentation">
@@ -104,14 +104,14 @@
  */
 if ( isset( $GLOBALS['wp_settings']['media']['embeds'] ) ) :
 	?>
-<h2 class="title"><?php _e( 'Embeds' ); ?></h2>
+<h2 id="embeds" class="title"><?php _e( 'Embeds' ); ?></h2>
 <table class="form-table" role="presentation">
 	<?php do_settings_fields( 'media', 'embeds' ); ?>
 </table>
 <?php endif; ?>
 
 <?php if ( ! is_multisite() ) : ?>
-<h2 class="title"><?php _e( 'Uploading Files' ); ?></h2>
+<h2 id="uploading-files" class="title"><?php _e( 'Uploading Files' ); ?></h2>
 <table class="form-table" role="presentation">
 	<?php
 	/*
diff --git a/src/wp-admin/options-permalink.php b/src/wp-admin/options-permalink.php
index 046c237b6a948..1e9fe60634ecd 100644
--- a/src/wp-admin/options-permalink.php
+++ b/src/wp-admin/options-permalink.php
@@ -314,7 +314,7 @@
 /* translators: %s: Permalink structure tag. */
 $tag_already_used = __( '%s (already used in permalink structure)' );
 ?>
-<h2 class="title"><?php _e( 'Common Settings' ); ?></h2>
+<h2 id="common-settings" class="title"><?php _e( 'Common Settings' ); ?></h2>
 <p>
 <?php
 printf(
@@ -405,7 +405,7 @@ class="button button-secondary"
 </tbody>
 </table>
 
-<h2 class="title"><?php _e( 'Optional' ); ?></h2>
+<h2 id="optional" class="title"><?php _e( 'Optional' ); ?></h2>
 <p class="permalink-structure-optional-description">
 <?php
 printf(
diff --git a/src/wp-admin/options-writing.php b/src/wp-admin/options-writing.php
index 6f85b54679327..175d795b49593 100644
--- a/src/wp-admin/options-writing.php
+++ b/src/wp-admin/options-writing.php
@@ -141,7 +141,7 @@
 /** This filter is documented in wp-admin/options.php */
 if ( apply_filters( 'enable_post_by_email_configuration', true ) ) {
 	?>
-<h2 class="title"><?php _e( 'Post via email' ); ?></h2>
+<h2 id="post-via-email" class="title"><?php _e( 'Post via email' ); ?></h2>
 <p>
 	<?php
 	printf(
@@ -212,7 +212,7 @@
  */
 if ( apply_filters( 'enable_update_services_configuration', true ) ) {
 	?>
-<h2 class="title"><?php _e( 'Update Services' ); ?></h2>
+<h2 id="update-services" class="title"><?php _e( 'Update Services' ); ?></h2>
 
 	<?php if ( '1' === get_option( 'blog_public' ) ) : ?>
 

From 78f84170a15da6925c111d3bf6eb17a30f882113 Mon Sep 17 00:00:00 2001
From: Joe Dolson <design@joedolson.com>
Date: Tue, 7 Jul 2026 15:26:16 -0500
Subject: [PATCH 2/4] Add prefix to section ID to reduce conflicts.

---
 src/wp-admin/includes/template.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wp-admin/includes/template.php b/src/wp-admin/includes/template.php
index 5f283761e2880..4021bfea5baff 100644
--- a/src/wp-admin/includes/template.php
+++ b/src/wp-admin/includes/template.php
@@ -1780,7 +1780,7 @@ function do_settings_sections( $page ) {
 		}
 
 		if ( $section['title'] ) {
-			echo '<h2 id="' . esc_attr( $section['id'] ) . '">' . $section['title'] . "</h2>\n";
+			echo '<h2 id="wp_section_' . esc_attr( $section['id'] ) . '">' . $section['title'] . "</h2>\n";
 		}
 
 		if ( $section['callback'] ) {

From d02b98b4cda1a1cea21ef681bafdeb61e8727d68 Mon Sep 17 00:00:00 2001
From: Andrea Fercia <a.fercia@gmail.com>
Date: Thu, 9 Jul 2026 15:44:17 +0200
Subject: [PATCH 3/4] Use wp_unique_id.

---
 src/wp-admin/includes/template.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/wp-admin/includes/template.php b/src/wp-admin/includes/template.php
index 4021bfea5baff..336e8625f5f9f 100644
--- a/src/wp-admin/includes/template.php
+++ b/src/wp-admin/includes/template.php
@@ -1780,7 +1780,8 @@ function do_settings_sections( $page ) {
 		}
 
 		if ( $section['title'] ) {
-			echo '<h2 id="wp_section_' . esc_attr( $section['id'] ) . '">' . $section['title'] . "</h2>\n";
+			$unique_id = wp_unique_id( 'wp-settings-section-' . $section['id'] . '-' );
+			echo '<h2 id="' . esc_attr( $unique_id ) . '">' . $section['title'] . "</h2>\n";
 		}
 
 		if ( $section['callback'] ) {

From 5144d56896c31453f62dc604f2c5bff75bfb7595 Mon Sep 17 00:00:00 2001
From: Andrea Fercia <a.fercia@gmail.com>
Date: Thu, 9 Jul 2026 15:51:34 +0200
Subject: [PATCH 4/4] Add prefix to core setting sections.

---
 src/wp-admin/options-discussion.php | 2 +-
 src/wp-admin/options-media.php      | 6 +++---
 src/wp-admin/options-permalink.php  | 4 ++--
 src/wp-admin/options-writing.php    | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/wp-admin/options-discussion.php b/src/wp-admin/options-discussion.php
index 3fe231286831e..f8e4d5040f4e7 100644
--- a/src/wp-admin/options-discussion.php
+++ b/src/wp-admin/options-discussion.php
@@ -211,7 +211,7 @@
 <?php do_settings_fields( 'discussion', 'default' ); ?>
 </table>
 
-<h2 id="avatars" class="title"><?php _e( 'Avatars' ); ?></h2>
+<h2 id="wp-settings-section-avatars" class="title"><?php _e( 'Avatars' ); ?></h2>
 
 <p><?php _e( 'An avatar is an image that can be associated with a user across multiple websites. In this area, you can choose to display avatars of users who interact with the site.' ); ?></p>
 
diff --git a/src/wp-admin/options-media.php b/src/wp-admin/options-media.php
index 973fc063637de..d7decddf01537 100644
--- a/src/wp-admin/options-media.php
+++ b/src/wp-admin/options-media.php
@@ -52,7 +52,7 @@
 <form action="options.php" method="post">
 <?php settings_fields( 'media' ); ?>
 
-<h2 id="image-sizes" class="title"><?php _e( 'Image sizes' ); ?></h2>
+<h2 id="wp-settings-section-image-sizes" class="title"><?php _e( 'Image sizes' ); ?></h2>
 <p><?php _e( 'The sizes listed below determine the maximum dimensions in pixels to use when adding an image to the Media Library.' ); ?></p>
 
 <table class="form-table" role="presentation">
@@ -104,14 +104,14 @@
  */
 if ( isset( $GLOBALS['wp_settings']['media']['embeds'] ) ) :
 	?>
-<h2 id="embeds" class="title"><?php _e( 'Embeds' ); ?></h2>
+<h2 id="wp-settings-section-embeds" class="title"><?php _e( 'Embeds' ); ?></h2>
 <table class="form-table" role="presentation">
 	<?php do_settings_fields( 'media', 'embeds' ); ?>
 </table>
 <?php endif; ?>
 
 <?php if ( ! is_multisite() ) : ?>
-<h2 id="uploading-files" class="title"><?php _e( 'Uploading Files' ); ?></h2>
+<h2 id="wp-settings-section-uploading-files" class="title"><?php _e( 'Uploading Files' ); ?></h2>
 <table class="form-table" role="presentation">
 	<?php
 	/*
diff --git a/src/wp-admin/options-permalink.php b/src/wp-admin/options-permalink.php
index 1e9fe60634ecd..86111f26ca266 100644
--- a/src/wp-admin/options-permalink.php
+++ b/src/wp-admin/options-permalink.php
@@ -314,7 +314,7 @@
 /* translators: %s: Permalink structure tag. */
 $tag_already_used = __( '%s (already used in permalink structure)' );
 ?>
-<h2 id="common-settings" class="title"><?php _e( 'Common Settings' ); ?></h2>
+<h2 id="wp-settings-section-common-settings" class="title"><?php _e( 'Common Settings' ); ?></h2>
 <p>
 <?php
 printf(
@@ -405,7 +405,7 @@ class="button button-secondary"
 </tbody>
 </table>
 
-<h2 id="optional" class="title"><?php _e( 'Optional' ); ?></h2>
+<h2 id="wp-settings-section-optional" class="title"><?php _e( 'Optional' ); ?></h2>
 <p class="permalink-structure-optional-description">
 <?php
 printf(
diff --git a/src/wp-admin/options-writing.php b/src/wp-admin/options-writing.php
index 175d795b49593..1a44978d71f8f 100644
--- a/src/wp-admin/options-writing.php
+++ b/src/wp-admin/options-writing.php
@@ -141,7 +141,7 @@
 /** This filter is documented in wp-admin/options.php */
 if ( apply_filters( 'enable_post_by_email_configuration', true ) ) {
 	?>
-<h2 id="post-via-email" class="title"><?php _e( 'Post via email' ); ?></h2>
+<h2 id="wp-settings-section-post-via-email" class="title"><?php _e( 'Post via email' ); ?></h2>
 <p>
 	<?php
 	printf(
@@ -212,7 +212,7 @@
  */
 if ( apply_filters( 'enable_update_services_configuration', true ) ) {
 	?>
-<h2 id="update-services" class="title"><?php _e( 'Update Services' ); ?></h2>
+<h2 id="wp-settings-section-update-services" class="title"><?php _e( 'Update Services' ); ?></h2>
 
 	<?php if ( '1' === get_option( 'blog_public' ) ) : ?>