WordPress.org

Make WordPress Core

Ticket #16588: 16588.diff

File 16588.diff, 808 bytes (added by nacin, 7 years ago)
  • wp-includes/admin-bar.php

     
    337337 * @return bool Whether the admin bar should be showing.
    338338 */
    339339function is_admin_bar_showing() {
    340         global $show_admin_bar;
     340        global $show_admin_bar, $pagenow;
    341341
    342342        /* For all these types of request we never want an admin bar period */
    343343        if ( defined('XMLRPC_REQUEST') || defined('APP_REQUEST') || defined('DOING_AJAX') || defined('IFRAME_REQUEST') )
    344344                return false;
    345345
    346346        if ( ! isset( $show_admin_bar ) ) {
    347                 if ( ! is_user_logged_in() ) {
     347                if ( ! is_user_logged_in() || 'wp-login.php' == $pagenow ) {
    348348                        $show_admin_bar = false;
    349349                } else {
    350350                        $context = is_admin() ? 'admin' : 'front';