Ticket #16249: 16249.diff

wp-includes/class-wp-admin-bar.php

@@ -17 +17 @@
         }
 
         public function initialize() {
+        global $show_admin_bar;
+
                 $this->user = new stdClass;
 
                 if ( is_user_logged_in() ) {
@@ -42 +44 @@
                         $header_callback = $admin_bar_args[0]['callback'];
                 }
 
-                if ( empty($header_callback) )
-                        $header_callback = '_admin_bar_bump_cb';
+                if ( $show_admin_bar != false ) {
+                        if ( empty($header_callback) )
+                                $header_callback = '_admin_bar_bump_cb';
 
-                add_action('wp_head', $header_callback);
+                        add_action('wp_head', $header_callback);
+                        wp_enqueue_script( 'admin-bar' );
+                        wp_enqueue_style( 'admin-bar' );
 
-                wp_enqueue_script( 'admin-bar' );
-                wp_enqueue_style( 'admin-bar' );
+                        do_action( 'admin_bar_init' );
 
-                do_action( 'admin_bar_init' );
+                }
+
         }
 
         public function add_menu( $node ) {