Changeset 15834 for trunk/wp-includes/admin-bar.php

Timestamp:

10/18/2010 05:58:36 PM (15 years ago)

Author:

ryan

Message:

Allow turning off the admin bar via WP_SHOW_ADMIN_BAR constant, no_admin_bar() function, or show_admin_bar filter. see #14772

File:

• trunk/wp-includes/admin-bar.php (modified) (5 diffs)

trunk/wp-includes/admin-bar.php

@@ -12 +12 @@
     global $current_user, $pagenow, $wp_admin_bar;
 
+    if ( defined('WP_SHOW_ADMIN_BAR') )
+        $show_it = (bool) WP_SHOW_ADMIN_BAR;
+    else
+        $show_it = true;
+
+    if ( ! apply_filters('show_admin_bar', $show_it, get_current_screen() ) )
+        return false;
+
     /* Set the protocol constant used throughout this code */
     if ( !defined( 'PROTO' ) )
         if ( is_ssl() ) define( 'PROTO', 'https://' ); else define( 'PROTO', 'http://' );
 
-    /* Don't load the admin bar if the user is not logged in, or we are using press this */
-    if ( !is_user_logged_in() || 'press-this.php' == $pagenow || 'update.php' == $pagenow )
+    /* Don't load the admin bar if the user is not logged in */
+    if ( !is_user_logged_in() )
         return false;
 
@@ -27 +35 @@
     if ( is_user_logged_in() )
         wp_enqueue_script( 'jquery', false, false, false, true );
-    
+
     /* Load the admin bar class code ready for instantiation */
     require( ABSPATH . WPINC . '/admin-bar/admin-bar-class.php' );
@@ -39 +47 @@
     /* Initialize the admin bar */
     $wp_admin_bar = new wp_admin_bar();
+
+    add_action( 'wp_head', 'wp_admin_bar_css' );
+    add_action( 'admin_head', 'wp_admin_bar_css' );
 }
 add_action( 'init', 'wp_admin_bar_init' );
@@ -222 +233 @@
     global $pagenow, $wp_locale;
 
-    if ( !is_user_logged_in() || 'press-this.php' == $pagenow || 'update.php' == $pagenow || 'media-upload.php' == $pagenow )
+    if ( !is_user_logged_in() )
         return;
 
@@ -233 +244 @@
     <style type="text/css" media="print">#wpadminbar { display:none; }</style><?php
 }
-add_action( 'wp_head', 'wp_admin_bar_css' );
-add_action( 'admin_head', 'wp_admin_bar_css' );
 
 /**