Make WordPress Core

Changeset 16071


Ignore:
Timestamp:
10/29/2010 07:44:02 AM (13 years ago)
Author:
westi
Message:

If someone has defined WP_SHOW_ADMIN_BAR it wins period. Otherwise we break for things like XMLRPC which disable this always. See #14772.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-includes/admin-bar.php

    r16070 r16071  
    242242function is_admin_bar_showing() {
    243243    global $show_admin_bar;
    244 
    245244    if ( ! isset( $show_admin_bar ) || null === $show_admin_bar ) {
    246245        $show_admin_bar = true;
     
    248247        if ( defined('WP_SHOW_ADMIN_BAR') )
    249248            $show_admin_bar = (bool) WP_SHOW_ADMIN_BAR;
    250 
    251         if ( 
    252             ! is_user_logged_in() ||
    253             ( is_admin() && ! is_multisite() )
    254         )
     249        else if ( ! is_user_logged_in() || ( is_admin() && ! is_multisite() ) )
    255250            $show_admin_bar = false;
    256251    }
Note: See TracChangeset for help on using the changeset viewer.