Changeset 2599

Timestamp:

02/04/2010 05:11:17 PM (16 years ago)

Author:

apeatling

Message:

Make sure the admin bar styles from the active theme are loaded in the admin area.

File:

• trunk/bp-core/bp-core-cssjs.php (modified) (1 diff)

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

@@ -10 +10 @@
  */
 function bp_core_add_admin_bar_css() {
-    global $bp;
+    global $bp, $current_blog;
 
     if ( defined( 'BP_DISABLE_ADMIN_BAR' ) )
         return false;
 
-    if ( !bp_core_is_multisite() )
-        return false;
-
-    if ( $bp->current_blog != BP_ROOT_BLOG ) {
+    if ( ( bp_core_is_multisite() && $current_blog->blog_id != BP_ROOT_BLOG ) || is_admin() ) {
         $stylesheet = get_blog_option( BP_ROOT_BLOG, 'stylesheet' );