Changeset 3232 for trunk/bp-core/bp-core-cssjs.php

Timestamp:

09/06/2010 04:24:57 PM (14 years ago)

Author:

apeatling

Message:

Merging 1.2 branch with trunk

File:

• trunk/bp-core/bp-core-cssjs.php (modified) (2 diffs)

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

@@ -48 +48 @@
     global $current_blog;
 
-    if ( bp_core_is_multisite() && $current_blog->blog_id != BP_ROOT_BLOG )
+    if ( $current_blog->blog_id != BP_ROOT_BLOG )
         return false;
 ?>
@@ -175 +175 @@
     global $bp;
 
-    if ( defined( 'BP_DISABLE_ADMIN_BAR' ) || ( (int)get_site_option( 'hide-loggedout-adminbar' ) && !is_user_logged_in() ) ) {
+    if ( defined( '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>