From 98da858b40b155b89b9c8c12f76e61003ca80b3e Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Sun, 25 Jan 2015 18:33:22 +0000
Subject: [PATCH] Revert [30027]. These fields are already sufficiently
 labeled; duplicate labels can lead to confused behavior for screen readers.

see #31117, #30101.
Built from https://develop.svn.wordpress.org/trunk@31281


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

diff --git a/wp-admin/user-edit.php b/wp-admin/user-edit.php
index 1d60057b11..c281023d6c 100644
--- a/wp-admin/user-edit.php
+++ b/wp-admin/user-edit.php
@@ -246,7 +246,7 @@ if ( ! IS_PROFILE_PAGE ) {
 <table class="form-table">
 <?php if ( ! ( IS_PROFILE_PAGE && ! $user_can_edit ) ) : ?>
 	<tr class="user-rich-editing-wrap">
-		<th scope="row"><label for="rich_editing"><?php _e( 'Visual Editor' )?></label></th>
+		<th scope="row"><?php _e( 'Visual Editor' ); ?></th>
 		<td><label for="rich_editing"><input name="rich_editing" type="checkbox" id="rich_editing" value="false" <?php if ( ! empty( $profileuser->rich_editing ) ) checked( 'false', $profileuser->rich_editing ); ?> /> <?php _e( 'Disable the visual editor when writing' ); ?></label></td>
 	</tr>
 <?php endif; ?>
@@ -272,12 +272,12 @@ if ( ! IS_PROFILE_PAGE ) {
 endif; // $_wp_admin_css_colors
 if ( !( IS_PROFILE_PAGE && !$user_can_edit ) ) : ?>
 <tr class="user-comment-shortcuts-wrap">
-<th scope="row"><label for="comment_shortcuts"><?php _e( 'Keyboard Shortcuts' ); ?></label></th>
+<th scope="row"><?php _e( 'Keyboard Shortcuts' ); ?></th>
 <td><label for="comment_shortcuts"><input type="checkbox" name="comment_shortcuts" id="comment_shortcuts" value="true" <?php if ( ! empty( $profileuser->comment_shortcuts ) ) checked( 'true', $profileuser->comment_shortcuts ); ?> /> <?php _e('Enable keyboard shortcuts for comment moderation.'); ?></label> <?php _e('<a href="http://codex.wordpress.org/Keyboard_Shortcuts" target="_blank">More information</a>'); ?></td>
 </tr>
 <?php endif; ?>
 <tr class="show-admin-bar user-admin-bar-front-wrap">
-<th scope="row"><label for="admin_bar_front"><?php _e( 'Toolbar' )?></label></th>
+<th scope="row"><?php _e( 'Toolbar' ); ?></th>
 <td><fieldset><legend class="screen-reader-text"><span><?php _e('Toolbar') ?></span></legend>
 <label for="admin_bar_front">
 <input name="admin_bar_front" type="checkbox" id="admin_bar_front" value="1"<?php checked( _get_admin_bar_pref( 'front', $profileuser->ID ) ); ?> />
diff --git a/wp-includes/version.php b/wp-includes/version.php
index e0d60f251d..260b823149 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.2-alpha-31280';
+$wp_version = '4.2-alpha-31281';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.