From e7ee7a2eaac7720e1c749f1061787a5d7bd1c6a9 Mon Sep 17 00:00:00 2001 From: westi Date: Fri, 29 Oct 2010 07:44:02 +0000 Subject: [PATCH] If someone has defined WP_SHOW_ADMIN_BAR it wins period. Otherwise we break for things like XMLRPC which disable this always. See #14772. git-svn-id: http://svn.automattic.com/wordpress/trunk@16071 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/admin-bar.php | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/wp-includes/admin-bar.php b/wp-includes/admin-bar.php index 305e659af5..e758e7f0d3 100644 --- a/wp-includes/admin-bar.php +++ b/wp-includes/admin-bar.php @@ -241,17 +241,12 @@ function wp_admin_body_style() { */ function is_admin_bar_showing() { global $show_admin_bar; - if ( ! isset( $show_admin_bar ) || null === $show_admin_bar ) { $show_admin_bar = true; if ( defined('WP_SHOW_ADMIN_BAR') ) $show_admin_bar = (bool) WP_SHOW_ADMIN_BAR; - - if ( - ! is_user_logged_in() || - ( is_admin() && ! is_multisite() ) - ) + else if ( ! is_user_logged_in() || ( is_admin() && ! is_multisite() ) ) $show_admin_bar = false; }