WordPress.org

Make WordPress Core

Changeset 18700


Ignore:
Timestamp:
09/17/2011 10:26:01 PM (7 years ago)
Author:
nacin
Message:

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.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-admin/user-edit.php

    r17975 r18700  
    214214<?php endif; ?>
    215215<tr class="show-admin-bar">
    216 <th scope="row"><?php _e('Show Admin Bar')?></th>
    217 <td><fieldset><legend class="screen-reader-text"><span><?php _e('Show Admin Bar') ?></span></legend>
     216<th scope="row"><?php _e('Admin Bar')?></th>
     217<td><fieldset><legend class="screen-reader-text"><span><?php _e('Admin Bar') ?></span></legend>
    218218<label for="admin_bar_front">
    219 <input name="admin_bar_front" type="checkbox" id="admin_bar_front" value="1" <?php checked( _get_admin_bar_pref( 'front', $profileuser->ID ) ); ?> />
    220 <?php /* translators: Show admin bar when viewing site */ _e( 'when viewing site' ); ?></label><br />
    221 <label for="admin_bar_admin">
    222 <input name="admin_bar_admin" type="checkbox" id="admin_bar_admin" value="1" <?php checked( _get_admin_bar_pref( 'admin', $profileuser->ID ) ); ?> />
    223 <?php /* translators: Show admin bar in dashboard */ _e( 'in dashboard' ); ?></label></fieldset>
     219<input name="admin_bar_front" type="checkbox" id="admin_bar_front" value="1"<?php checked( _get_admin_bar_pref( 'front', $profileuser->ID ) ); ?> />
     220<?php _e( 'Show Admin Bar when viewing site' ); ?></label><br />
     221</fieldset>
    224222</td>
    225223</tr>
  • trunk/wp-includes/admin-bar.php

    r18696 r18700  
    541541    global $show_admin_bar, $pagenow;
    542542
    543     /* For all these types of request we never want an admin bar period */
     543    // For all these types of requests, we never want an admin bar.
    544544    if ( defined('XMLRPC_REQUEST') || defined('APP_REQUEST') || defined('DOING_AJAX') || defined('IFRAME_REQUEST') )
    545545        return false;
     546
     547    // Integrated into the admin.
     548    if ( is_admin() )
     549        return true;
    546550
    547551    if ( ! isset( $show_admin_bar ) ) {
     
    549553            $show_admin_bar = false;
    550554        } else {
    551             $context = is_admin() ? 'admin' : 'front';
    552             $show_admin_bar = _get_admin_bar_pref( $context );
     555            $show_admin_bar = _get_admin_bar_pref();
    553556        }
    554557    }
     
    560563
    561564/**
    562  * Retrieve the admin bar display preference of a user based on context.
     565 * Retrieve the admin bar display preference of a user.
    563566 *
    564567 * @since 3.1.0
    565568 * @access private
    566569 *
    567  * @param string $context Context of this preference check, either 'admin' or 'front'.
     570 * @param string $context Context of this preference check. Defaults to 'front'. The 'admin'
     571 *  preference is no longer used.
    568572 * @param int $user Optional. ID of the user to check, defaults to 0 for current user.
    569573 * @return bool Whether the admin bar should be showing for this user.
    570574 */
    571 function _get_admin_bar_pref( $context, $user = 0 ) {
     575function _get_admin_bar_pref( $context = 'front', $user = 0 ) {
    572576    $pref = get_user_option( "show_admin_bar_{$context}", $user );
    573577    if ( false === $pref )
Note: See TracChangeset for help on using the changeset viewer.