Changeset 3951 for trunk/bp-core/bp-core-buddybar.php

Timestamp:

01/27/2011 03:40:28 PM (14 years ago)

Author:

johnjamesjacoby

Message:

If no blogs for user can be found or bp_blogs_get_blogs_for_user fails, do not show an empty blogs menu.

File:

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

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

@@ -413 +413 @@
     }
 
-    echo '<li id="bp-adminbar-blogs-menu"><a href="' . $bp->loggedin_user->domain . $bp->blogs->slug . '/">';
-
-    _e( 'My Blogs', 'buddypress' );
-
-    echo '</a>';
-    echo '<ul>';
-
     $counter = 0;
     if ( is_array( $blogs['blogs'] ) && (int)$blogs['count'] ) {
+
+        echo '<li id="bp-adminbar-blogs-menu"><a href="' . trailingslashit( $bp->loggedin_user->domain . $bp->blogs->slug ) . '">';
+
+        _e( 'My Blogs', 'buddypress' );
+
+        echo '</a>';
+        echo '<ul>';
+
         foreach ( (array)$blogs['blogs'] as $blog ) {
-            $alt = ( 0 == $counter % 2 ) ? ' class="alt"' : '';
+            $alt      = ( 0 == $counter % 2 ) ? ' class="alt"' : '';
             $site_url = esc_attr( $blog->siteurl );
 
@@ -440 +441 @@
             $counter++;
         }
-    }
-
-    $alt = ( 0 == $counter % 2 ) ? ' class="alt"' : '';
-
-    if ( bp_blog_signup_enabled() ) {
-        echo '<li' . $alt . '>';
-        echo '<a href="' . $bp->root_domain . '/' . $bp->blogs->root_slug . '/create/">' . __( 'Create a Blog!', 'buddypress' ) . '</a>';
+
+        $alt = ( 0 == $counter % 2 ) ? ' class="alt"' : '';
+
+        if ( bp_blog_signup_enabled() ) {
+            echo '<li' . $alt . '>';
+            echo '<a href="' . $bp->root_domain . '/' . $bp->blogs->root_slug . '/create/">' . __( 'Create a Blog!', 'buddypress' ) . '</a>';
+            echo '</li>';
+        }
+
+        echo '</ul>';
         echo '</li>';
     }
-
-    echo '</ul>';
-    echo '</li>';
 }