Ticket #2023: 2023.patch

bp-core.php

@@ -44 +44 @@
 if ( bp_core_is_multisite() )
         require ( BP_PLUGIN_DIR . '/bp-core/bp-core-activation.php' );
 
-/* If BP_DISABLE_ADMIN_BAR is defined, do not load the global admin bar. */
-if ( !defined( 'BP_DISABLE_ADMIN_BAR' ) )
+/* If BP_DISABLE_ADMIN_BAR is defined and set to true, do not load the global admin bar. */
+if ( ! ( defined( 'BP_DISABLE_ADMIN_BAR' ) && BP_DISABLE_ADMIN_BAR ) )
         require ( BP_PLUGIN_DIR . '/bp-core/bp-core-adminbar.php' );
 
 /* Define the slug for member pages and the members directory (e.g. domain.com/[members] ) */

bp-core/bp-core-adminbar.php

@@ -3 +3 @@
 function bp_core_admin_bar() {
         global $bp, $wpdb, $current_blog;
 
-        if ( defined( 'BP_DISABLE_ADMIN_BAR' ) )
+        if ( defined( 'BP_DISABLE_ADMIN_BAR' ) && BP_DISABLE_ADMIN_BAR )
                 return false;
 
         if ( (int)$bp->site_options['hide-loggedout-adminbar'] && !is_user_logged_in() )

bp-core/bp-core-cssjs.php

@@ -11 +11 @@
 function bp_core_add_admin_bar_css() {
         global $bp, $current_blog;
 
-        if ( defined( 'BP_DISABLE_ADMIN_BAR' ) )
+        if ( defined( 'BP_DISABLE_ADMIN_BAR' ) && BP_DISABLE_ADMIN_BAR )
                 return false;
 
         if ( ( bp_core_is_multisite() && $current_blog->blog_id != BP_ROOT_BLOG ) || is_admin() ) {
@@ -174 +174 @@
 function bp_core_override_adminbar_css() {
         global $bp;
 
-        if ( defined( 'BP_DISABLE_ADMIN_BAR' ) || ( $bp->site_options['hide-loggedout-adminbar'] && !is_user_logged_in() ) ) {
+        if ( ( defined( 'BP_DISABLE_ADMIN_BAR' ) && BP_DISABLE_ADMIN_BAR ) || ( $bp->site_options['hide-loggedout-adminbar'] && !is_user_logged_in() ) ) {
         ?>
 <style type="text/css">body { padding-top: 0 !important; } #wp-admin-bar { display: none; }</style>
         <?php }