Ticket #7810: 7810.2.patch

src/bp-core/admin/bp-core-admin-settings.php

@@ -70 +70 @@
         }
 
         if ( $options ) : ?>
-                <select name="_bp_theme_package_id" id="_bp_theme_package_id"><?php echo $options; ?></select>
-                <p class="description"><label for="_bp_theme_package_id"><?php esc_html_e( 'The selected Template Pack will serve all BuddyPress templates.', 'buddypress' ); ?></label></p>
+                <select name="_bp_theme_package_id" id="_bp_theme_package_id" aria-describedby="_bp_theme_package_description"><?php echo $options; ?></select>
+                <p id="_bp_theme_package_description" class="description"><?php esc_html_e( 'The selected Template Pack will serve all BuddyPress templates.', 'buddypress' ); ?></p>
 
         <?php else : ?>
                 <p><?php esc_html_e( 'No template packages available.', 'buddypress' ); ?></p>
@@ -216 +216 @@
 function bp_admin_setting_callback_group_creation() {
 ?>
 
-        <input id="bp_restrict_group_creation" name="bp_restrict_group_creation" type="checkbox"value="1" <?php checked( !bp_restrict_group_creation( false ) ); ?> />
+        <input id="bp_restrict_group_creation" name="bp_restrict_group_creation" type="checkbox" aria-describedby="bp_group_creation_description" value="1" <?php checked( !bp_restrict_group_creation( false ) ); ?> />
         <label for="bp_restrict_group_creation"><?php _e( 'Enable group creation for all users', 'buddypress' ); ?></label>
-        <p class="description"><?php _e( 'Administrators can always create groups, regardless of this setting.', 'buddypress' ); ?></p>
+        <p class="description" id="bp_group_creation_description"><?php _e( 'Administrators can always create groups, regardless of this setting.', 'buddypress' ); ?></p>
 
 <?php
 }

src/bp-core/classes/class-bp-admin.php

@@ -388 +388 @@
                 register_setting( 'buddypress', 'bp-disable-account-deletion', 'intval' );
 
                 // Template pack picker.
-                add_settings_field( '_bp_theme_package_id', __( 'Template Pack', 'buddypress' ), 'bp_admin_setting_callback_theme_package_id', 'buddypress', 'bp_main' );
+                add_settings_field( '_bp_theme_package_id', __( 'Template Pack', 'buddypress' ), 'bp_admin_setting_callback_theme_package_id', 'buddypress', 'bp_main', array( 'label_for' => '_bp_theme_package_id' ) );
                 register_setting( 'buddypress', '_bp_theme_package_id', 'sanitize_text_field' );
 
                 /* XProfile Section **************************************************/