Force the admin bar on in the admin as it is now integrated. Removes the second UI option. Leaves out the upgrade routine for now. see #18197.

git-svn-id: http://svn.automattic.com/wordpress/trunk@18700 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
nacin 2011-09-17 22:26:01 +00:00
parent b3dfd9e953
commit 2ee655428d
2 changed files with 15 additions and 13 deletions

View File

@ -213,14 +213,12 @@ if ( !( IS_PROFILE_PAGE && !$user_can_edit ) ) : ?>
</tr> </tr>
<?php endif; ?> <?php endif; ?>
<tr class="show-admin-bar"> <tr class="show-admin-bar">
<th scope="row"><?php _e('Show Admin Bar')?></th> <th scope="row"><?php _e('Admin Bar')?></th>
<td><fieldset><legend class="screen-reader-text"><span><?php _e('Show Admin Bar') ?></span></legend> <td><fieldset><legend class="screen-reader-text"><span><?php _e('Admin Bar') ?></span></legend>
<label for="admin_bar_front"> <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 ) ); ?> /> <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 /> <?php _e( 'Show Admin Bar when viewing site' ); ?></label><br />
<label for="admin_bar_admin"> </fieldset>
<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></fieldset>
</td> </td>
</tr> </tr>
<?php do_action('personal_options', $profileuser); ?> <?php do_action('personal_options', $profileuser); ?>

View File

@ -540,16 +540,19 @@ function show_admin_bar( $show ) {
function is_admin_bar_showing() { function is_admin_bar_showing() {
global $show_admin_bar, $pagenow; global $show_admin_bar, $pagenow;
/* For all these types of request we never want an admin bar period */ // For all these types of requests, we never want an admin bar.
if ( defined('XMLRPC_REQUEST') || defined('APP_REQUEST') || defined('DOING_AJAX') || defined('IFRAME_REQUEST') ) if ( defined('XMLRPC_REQUEST') || defined('APP_REQUEST') || defined('DOING_AJAX') || defined('IFRAME_REQUEST') )
return false; return false;
// Integrated into the admin.
if ( is_admin() )
return true;
if ( ! isset( $show_admin_bar ) ) { if ( ! isset( $show_admin_bar ) ) {
if ( ! is_user_logged_in() || 'wp-login.php' == $pagenow ) { if ( ! is_user_logged_in() || 'wp-login.php' == $pagenow ) {
$show_admin_bar = false; $show_admin_bar = false;
} else { } else {
$context = is_admin() ? 'admin' : 'front'; $show_admin_bar = _get_admin_bar_pref();
$show_admin_bar = _get_admin_bar_pref( $context );
} }
} }
@ -559,16 +562,17 @@ function is_admin_bar_showing() {
} }
/** /**
* Retrieve the admin bar display preference of a user based on context. * Retrieve the admin bar display preference of a user.
* *
* @since 3.1.0 * @since 3.1.0
* @access private * @access private
* *
* @param string $context Context of this preference check, either 'admin' or 'front'. * @param string $context Context of this preference check. Defaults to 'front'. The 'admin'
* preference is no longer used.
* @param int $user Optional. ID of the user to check, defaults to 0 for current user. * @param int $user Optional. ID of the user to check, defaults to 0 for current user.
* @return bool Whether the admin bar should be showing for this user. * @return bool Whether the admin bar should be showing for this user.
*/ */
function _get_admin_bar_pref( $context, $user = 0 ) { function _get_admin_bar_pref( $context = 'front', $user = 0 ) {
$pref = get_user_option( "show_admin_bar_{$context}", $user ); $pref = get_user_option( "show_admin_bar_{$context}", $user );
if ( false === $pref ) if ( false === $pref )
return true; return true;