X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/f9001779751f83dc8a10e478bfecb4d8dd5f964c..refs/tags/wordpress-3.1.1:/wp-includes/admin-bar.php

diff --git a/wp-includes/admin-bar.php b/wp-includes/admin-bar.php
index a3f84ad5..9a950c09 100644
--- 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() {
-	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 ) ) {
-		if ( ! is_user_logged_in() ) {
+		if ( ! is_user_logged_in() || 'wp-login.php' == $pagenow ) {
 			$show_admin_bar = false;
 		} else {
 			$context = is_admin() ? 'admin' : 'front';