Wordpress 3.1.1

[autoinstalls/wordpress.git] / wp-includes / admin-bar.php

diff --git a/wp-includes/admin-bar.php b/wp-includes/admin-bar.php
index a3f84ad52bbb1f0e660639657fc761c9b8044f03..9a950c094e0920ad67cf7db8c230576c986f9b77 100644 (file)
--- a/wp-includes/admin-bar.php
+++ b/wp-includes/admin-bar.php
@@ -337,14 +337,14 @@ function show_admin_bar( $show ) {
  * @return bool Whether the admin bar should be showing.
  */
 function is_admin_bar_showing() {
  * @return bool Whether the admin bar should be showing.
  */
 function is_admin_bar_showing() {

-       global $show_admin_bar;
+       global $show_admin_bar, $pagenow;

 
        /* For all these types of request we never want an admin bar period */
        if ( defined('XMLRPC_REQUEST') || defined('APP_REQUEST') || defined('DOING_AJAX') || defined('IFRAME_REQUEST') )
                return false;
 
        if ( ! isset( $show_admin_bar ) ) {
 
        /* For all these types of request we never want an admin bar period */
        if ( defined('XMLRPC_REQUEST') || defined('APP_REQUEST') || defined('DOING_AJAX') || defined('IFRAME_REQUEST') )
                return false;
 
        if ( ! isset( $show_admin_bar ) ) {

-               if ( ! is_user_logged_in() ) {
+               if ( ! is_user_logged_in() || 'wp-login.php' == $pagenow ) {

                        $show_admin_bar = false;
                } else {
                        $context = is_admin() ? 'admin' : 'front';
                        $show_admin_bar = false;
                } else {
                        $context = is_admin() ? 'admin' : 'front';