Changeset 16221

Timestamp:

11/06/2010 09:41:03 AM (15 years ago)

Author:

westi

Message:

Remove WP_SHOW_ADMIN_BAR and go off existing and new defines on page type. See #15315

Location:

trunk

Files:

• wp-admin/admin-ajax.php (modified) (1 diff)
• wp-admin/media-upload.php (modified) (1 diff)
• wp-admin/plugin-install.php (modified) (1 diff)
• wp-admin/press-this.php (modified) (1 diff)
• wp-admin/update.php (modified) (1 diff)
• wp-app.php (modified) (1 diff)
• wp-includes/admin-bar.php (modified) (1 diff)
• xmlrpc.php (modified) (1 diff)

trunk/wp-admin/admin-ajax.php

@@ -14 +14 @@
 define('DOING_AJAX', true);
 define('WP_ADMIN', true);
-define('WP_SHOW_ADMIN_BAR' , false);
 
 if ( ! isset( $_REQUEST['action'] ) )

trunk/wp-admin/media-upload.php

@@ -10 +10 @@
  */
 
-define('WP_SHOW_ADMIN_BAR' , false);
+define('IFRAME_REQUEST' , true);
 
 /** Load WordPress Administration Bootstrap */

trunk/wp-admin/plugin-install.php

@@ -6 +6 @@
  * @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 */

trunk/wp-admin/press-this.php

@@ -7 +7 @@
  */
 
-define('WP_SHOW_ADMIN_BAR' , false);
+define('IFRAME_REQUEST' , true);
 
 /** WordPress Administration Bootstrap */

trunk/wp-admin/update.php

@@ -7 +7 @@
  */
 
-define('WP_SHOW_ADMIN_BAR' , false);
+define('IFRAME_REQUEST' , true);
 
 /** WordPress Administration Bootstrap */

trunk/wp-app.php

@@ -12 +12 @@
  */
 define('APP_REQUEST', true);
-define('WP_SHOW_ADMIN_BAR' , false);
 
 /** Set up WordPress environment */

trunk/wp-includes/admin-bar.php

@@ -329 +329 @@
 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;
+        }
     }
 

trunk/xmlrpc.php

@@ -12 +12 @@
  */
 define('XMLRPC_REQUEST', true);
-define('WP_SHOW_ADMIN_BAR' , false);
 
 // Some browser-embedded clients send cookies. We don't want them.