From ee291ef5a58042da5736501e7de364906748895c Mon Sep 17 00:00:00 2001
From: westi <westi@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Sat, 6 Nov 2010 09:41:03 +0000
Subject: [PATCH] Remove WP_SHOW_ADMIN_BAR and go off existing and new defines
 on page type. See #15315

git-svn-id: http://svn.automattic.com/wordpress/trunk@16221 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/admin-ajax.php     |  1 -
 wp-admin/media-upload.php   |  2 +-
 wp-admin/plugin-install.php |  3 +++
 wp-admin/press-this.php     |  2 +-
 wp-admin/update.php         |  2 +-
 wp-app.php                  |  1 -
 wp-includes/admin-bar.php   | 14 +++++++++-----
 xmlrpc.php                  |  1 -
 8 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/wp-admin/admin-ajax.php b/wp-admin/admin-ajax.php
index 3454dd9c4f..38f7dd97d7 100644
--- a/wp-admin/admin-ajax.php
+++ b/wp-admin/admin-ajax.php
@@ -13,7 +13,6 @@
  */
 define('DOING_AJAX', true);
 define('WP_ADMIN', true);
-define('WP_SHOW_ADMIN_BAR' , false);
 
 if ( ! isset( $_REQUEST['action'] ) )
 	die('-1');
diff --git a/wp-admin/media-upload.php b/wp-admin/media-upload.php
index fd47ccf8cb..71f64d93e3 100644
--- a/wp-admin/media-upload.php
+++ b/wp-admin/media-upload.php
@@ -9,7 +9,7 @@
  * @subpackage Administration
  */
 
-define('WP_SHOW_ADMIN_BAR' , false);
+define('IFRAME_REQUEST' , true);
 
 /** Load WordPress Administration Bootstrap */
 require_once('./admin.php');
diff --git a/wp-admin/plugin-install.php b/wp-admin/plugin-install.php
index f4fd7f2b86..cbdb055cd6 100644
--- a/wp-admin/plugin-install.php
+++ b/wp-admin/plugin-install.php
@@ -5,6 +5,9 @@
  * @package WordPress
  * @subpackage Administration
  */
+// TODO route this pages via a specific iframe handler instead of the do_action below
+if ( isset( $_GET['tab'] ) && ( 'plugin-information' == $_GET['tab'] ) )
+	define('IFRAME_REQUEST' , true);
 
 /** WordPress Administration Bootstrap */
 require_once('./admin.php');
diff --git a/wp-admin/press-this.php b/wp-admin/press-this.php
index 78891001f8..be4e7cbc68 100644
--- a/wp-admin/press-this.php
+++ b/wp-admin/press-this.php
@@ -6,7 +6,7 @@
  * @subpackage Press_This
  */
 
-define('WP_SHOW_ADMIN_BAR' , false);
+define('IFRAME_REQUEST' , true);
 
 /** WordPress Administration Bootstrap */
 require_once('./admin.php');
diff --git a/wp-admin/update.php b/wp-admin/update.php
index ad8edf22be..10a877bca7 100644
--- a/wp-admin/update.php
+++ b/wp-admin/update.php
@@ -6,7 +6,7 @@
  * @subpackage Administration
  */
 
-define('WP_SHOW_ADMIN_BAR' , false);
+define('IFRAME_REQUEST' , true);
 
 /** WordPress Administration Bootstrap */
 require_once('./admin.php');
diff --git a/wp-app.php b/wp-app.php
index 5a58dc36a9..2eaf6195e7 100644
--- a/wp-app.php
+++ b/wp-app.php
@@ -11,7 +11,6 @@
  * @var bool
  */
 define('APP_REQUEST', true);
-define('WP_SHOW_ADMIN_BAR' , false);
 
 /** Set up WordPress environment */
 require_once('./wp-load.php');
diff --git a/wp-includes/admin-bar.php b/wp-includes/admin-bar.php
index 9c34c46c20..d5cab62f6a 100644
--- a/wp-includes/admin-bar.php
+++ b/wp-includes/admin-bar.php
@@ -328,13 +328,17 @@ function wp_admin_body_style() {
  */
 function is_admin_bar_showing() {
 	global $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 ) || null === $show_admin_bar ) {
-		$show_admin_bar = true;
-
-		if ( defined('WP_SHOW_ADMIN_BAR') )
-			$show_admin_bar = (bool) WP_SHOW_ADMIN_BAR;
-		else if ( ! is_user_logged_in() || ( is_admin() && ! is_multisite() ) )
+		if ( ! is_user_logged_in() || ( is_admin() && ! is_multisite() ) ) {
 			$show_admin_bar = false;
+		} else {
+			$show_admin_bar = true;
+		}
 	}
 
 	$show_admin_bar = apply_filters( 'show_admin_bar', $show_admin_bar );
diff --git a/xmlrpc.php b/xmlrpc.php
index 4b15a0bf31..8517177642 100644
--- a/xmlrpc.php
+++ b/xmlrpc.php
@@ -11,7 +11,6 @@
  * @var bool
  */
 define('XMLRPC_REQUEST', true);
-define('WP_SHOW_ADMIN_BAR' , false);
 
 // Some browser-embedded clients send cookies. We don't want them.
 $_COOKIE = array();