From d2c179f49e2c45ddb7255bcea3d9f9ec04bf51ca Mon Sep 17 00:00:00 2001
From: nacin <nacin@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Fri, 7 Jan 2011 16:39:18 +0000
Subject: [PATCH] Revert _admin_bar_preferences() and add a class to the table
 row to allow it to be hidden. Forcing the use of CSS at least attempts to
 ensure that the developer will recognize that the saving aspect isn't
 handled. Handle this in the future across all settings screens. Reverts
 [17161]. fixes #16004.

git-svn-id: http://svn.automattic.com/wordpress/trunk@17234 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/user-edit.php    | 11 +++++++++++
 wp-includes/admin-bar.php | 23 -----------------------
 2 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/wp-admin/user-edit.php b/wp-admin/user-edit.php
index c3276d6930..c2bf3509fe 100644
--- a/wp-admin/user-edit.php
+++ b/wp-admin/user-edit.php
@@ -213,6 +213,17 @@ if ( !( IS_PROFILE_PAGE && !$user_can_edit ) ) : ?>
 <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>
+<th scope="row" class="show-admin-bar"><?php _e('Show Admin Bar')?></th>
+<td><fieldset><legend class="screen-reader-text"><span><?php _e('Show Admin Bar') ?></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 ) ); ?> />
+<?php /* translators: Show admin bar when viewing site */ _e( 'when viewing site' ); ?></label><br />
+<label for="admin_bar_admin">
+<input name="admin_bar_admin" type="checkbox" id="admin_bar_admin" value="1" <?php checked( _get_admin_bar_pref( 'admin', $profileuser->ID ) ); ?> />
+<?php /* translators: Show admin bar in dashboard */ _e( 'in dashboard' ); ?></label>
+</td>
+</tr>
 <?php do_action('personal_options', $profileuser); ?>
 </table>
 <?php
diff --git a/wp-includes/admin-bar.php b/wp-includes/admin-bar.php
index c1e45d645b..e44d0285f0 100644
--- a/wp-includes/admin-bar.php
+++ b/wp-includes/admin-bar.php
@@ -360,27 +360,4 @@ function _get_admin_bar_pref( $context, $user = 0 ) {
 	return 'true' === $pref;
 }
 
-/**
- * Add the admin bar display preferences to user profiles.
- *
- * @since 3.1.0
- * @access private
- */
-function _admin_bar_preferences( $profileuser ) {
-?>
-<tr>
-<th scope="row"><?php _e('Show Admin Bar')?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e('Show Admin Bar') ?></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 ) ); ?> />
-<?php /* translators: Show admin bar when viewing site */ _e( 'when viewing site' ); ?></label><br />
-<label for="admin_bar_admin">
-<input name="admin_bar_admin" type="checkbox" id="admin_bar_admin" value="1" <?php checked( _get_admin_bar_pref( 'admin', $profileuser->ID ) ); ?> />
-<?php /* translators: Show admin bar in dashboard */ _e( 'in dashboard' ); ?></label>
-</td>
-</tr>
-<?php
-}
-add_action( 'personal_options', '_admin_bar_preferences' );
-
 ?>
\ No newline at end of file