Changeset 4027

Timestamp:

02/08/2011 10:36:57 PM (13 years ago)

Author:

djpaul

Message:

Enqueue buddybar's CSS in core rather than the theme to prevent unstyled mess when using third-party themes

Location:

trunk

Files:

• bp-core/bp-core-buddybar.php (modified) (2 diffs)
• bp-core/bp-core-cssjs.php (modified) (1 diff)
• bp-themes/bp-default/style.css (modified) (1 diff)

trunk/bp-core/bp-core-buddybar.php

@@ -295 +295 @@
     global $bp;
 
-    if ( defined( 'BP_DISABLE_ADMIN_BAR' ) )
+    if ( defined( 'BP_DISABLE_ADMIN_BAR' ) && BP_DISABLE_ADMIN_BAR )
         return false;
 
@@ -450 +450 @@
         // TODO: Add BP support to WP admin bar
         return;
+
     } elseif ( !defined( 'BP_DISABLE_ADMIN_BAR' ) || !BP_DISABLE_ADMIN_BAR ) {
         // Keep the WP admin bar from loading
         show_admin_bar( false );
 
+        // Admin bar styles
+        $stylesheet = get_blog_option( BP_ROOT_BLOG, 'stylesheet' );
+
+        if ( file_exists( WP_CONTENT_DIR . '/themes/' . $stylesheet . '/_inc/css/adminbar.css' ) )
+            wp_enqueue_style( 'bp-admin-bar', apply_filters( 'bp_core_admin_bar_css', WP_CONTENT_URL . '/themes/' . $stylesheet . '/_inc/css/adminbar.css' ), array(), BP_VERSION );
+        else
+            wp_enqueue_style( 'bp-admin-bar', apply_filters( 'bp_core_admin_bar_css', BP_PLUGIN_URL . '/bp-themes/bp-default/_inc/css/adminbar.css' ), array(), BP_VERSION );
+        
         // Actions used to build the BP admin bar
         add_action( 'bp_adminbar_logo',  'bp_adminbar_logo' );

trunk/bp-core/bp-core-cssjs.php

@@ -1 +1 @@
 <?php
-
-/**
- * bp_core_add_admin_bar_css()
- *
- * Add the CSS needed for the admin bar on blogs (other than the root) and in the admin area.
- *
- * @package BuddyPress Core
- * @uses get_option() Selects a site setting from the DB.
- */
-function bp_core_add_admin_bar_css() {
-    global $bp, $current_blog;
-
-    if ( defined( 'BP_DISABLE_ADMIN_BAR' ) )
-        return false;
-
-    if ( ( is_multisite() && $current_blog->blog_id != BP_ROOT_BLOG ) || is_admin() ) {
-        $stylesheet = get_blog_option( BP_ROOT_BLOG, 'stylesheet' );
-
-        if ( file_exists( WP_CONTENT_DIR . '/themes/' . $stylesheet . '/_inc/css/adminbar.css' ) )
-            wp_enqueue_style( 'bp-admin-bar', apply_filters( 'bp_core_admin_bar_css', WP_CONTENT_URL . '/themes/' . $stylesheet . '/_inc/css/adminbar.css' ), array(), BP_VERSION );
-        else
-            wp_enqueue_style( 'bp-admin-bar', apply_filters( 'bp_core_admin_bar_css', BP_PLUGIN_URL . '/bp-themes/bp-default/_inc/css/adminbar.css' ), array(), BP_VERSION );
-    }
-}
-add_action( 'bp_init', 'bp_core_add_admin_bar_css' );
-
 /**
  * bp_core_admin_menu_icon_css()

trunk/bp-themes/bp-default/style.css

@@ -22 +22 @@
  */
 @import url( _inc/css/default.css );
-
-/***
- * The admin bar default styles
- */
-@import url( _inc/css/adminbar.css );