Changeset 2209 for trunk/bp-core/bp-core-adminbar.php

Timestamp:

12/27/2009 10:41:10 AM (16 years ago)

Author:

apeatling

Message:

Single WP support. Yes, you read that correctly.

File:

• trunk/bp-core/bp-core-adminbar.php (modified) (5 diffs)

trunk/bp-core/bp-core-adminbar.php

@@ -2 +2 @@
 
 function bp_core_admin_bar() {
-    global $bp, $wpdb, $current_blog, $doing_admin_bar;
+    global $bp, $wpdb, $current_blog;
 
     if ( defined( 'BP_DISABLE_ADMIN_BAR' ) )
         return false;
-
-    $doing_admin_bar = true;
 
     if ( (int)get_site_option( 'hide-loggedout-adminbar' ) && !is_user_logged_in() )
@@ -43 +41 @@
 
     // Show "Sign Up" link if user registrations are allowed
-    if ( get_site_option( 'registration' ) != 'none' && get_site_option( 'registration' ) != 'blog' ) {
-        echo '<li class="bp-signup no-arrow"><a href="' . bp_signup_page(false) . '">' . __( 'Sign Up', 'buddypress' ) . '</a></li>';
+    if ( bp_get_signup_allowed() ) {
+        echo '<li class="bp-signup no-arrow"><a href="' . bp_get_signup_page(false) . '">' . __( 'Sign Up', 'buddypress' ) . '</a></li>';
     }
 }
@@ -251 +249 @@
             <?php endif; ?>
 
-            <?php if ( function_exists('bp_blogs_install') ) : ?>
+            <?php if ( function_exists('bp_blogs_install') && bp_core_is_multiblog_install() ) : ?>
             <li><a href="<?php echo $bp->root_domain . '/' . $bp->blogs->slug . '/?random-blog' ?>"><?php _e( 'Random Blog', 'buddypress' ) ?></a></li>
 
@@ -260 +258 @@
     </li>
     <?php
-
-    $doing_admin_bar = false;
 }
 
@@ -267 +263 @@
 add_action( 'bp_adminbar_menus', 'bp_adminbar_login_menu', 2 );
 add_action( 'bp_adminbar_menus', 'bp_adminbar_account_menu', 4 );
-add_action( 'bp_adminbar_menus', 'bp_adminbar_blogs_menu', 6 );
+
+if ( bp_core_is_multiblog_install() )
+    add_action( 'bp_adminbar_menus', 'bp_adminbar_blogs_menu', 6 );
+
 add_action( 'bp_adminbar_menus', 'bp_adminbar_notifications_menu', 8 );
-add_action( 'bp_adminbar_menus', 'bp_adminbar_authors_menu', 12 );
+
+if ( bp_core_is_multiblog_install() )
+    add_action( 'bp_adminbar_menus', 'bp_adminbar_authors_menu', 12 );
+
 add_action( 'bp_adminbar_menus', 'bp_adminbar_random_menu', 100 );