Changeset 2083

Timestamp:

11/06/2009 10:34:10 AM (15 years ago)

Author:

apeatling

Message:

Removing the use of get_user_blogs() from the admin bar as it uses switch_to_blog() and is very slow. Using bp_blogs_get_blogs_for_user() instead. This takes 10-20 queries off each page load.

Location:

trunk

Files:

• bp-blogs/bp-blogs-classes.php (modified) (34 diffs)
• bp-core/bp-core-adminbar.php (modified) (2 diffs)

trunk/bp-blogs/bp-blogs-classes.php

@@ -5 +5 @@
     var $user_id;
     var $blog_id;
-    
+
     function bp_blogs_blog( $id = null ) {
         global $bp, $wpdb;
-        
+
         if ( !$user_id )
             $user_id = $bp->displayed_user->id;
@@ -17 +17 @@
         }
     }
-    
+
     function populate() {
         global $wpdb, $bp;
-        
+
         $blog = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$bp->blogs->table_name} WHERE id = %d", $this->id ) );
 
@@ -26 +26 @@
         $this->blog_id = $blog->blog_id;
     }
-    
+
     function save() {
         global $wpdb, $bp;
-        
+
         $this->user_id = apply_filters( 'bp_blogs_blog_user_id_before_save', $this->user_id, $this->id );
         $this->blog_id = apply_filters( 'bp_blogs_blog_id_before_save', $this->blog_id, $this->id );
-        
+
         do_action( 'bp_blogs_blog_before_save', $this );
-        
+
         // Don't try and save if there is no user ID or blog ID set.
         if ( !$this->user_id || !$this->blog_id )
             return false;
-            
+
         // Don't save if this blog has already been recorded for the user.
         if ( !$this->id && $this->exists() )
             return false;
-        
+
         if ( $this->id ) {
             // Update
@@ -50 +50 @@
             $sql = $wpdb->prepare( "INSERT INTO {$bp->blogs->table_name} ( user_id, blog_id ) VALUES ( %d, %d )", $this->user_id, $this->blog_id );
         }
-        
+
         if ( !$wpdb->query($sql) )
             return false;
-            
+
         do_action( 'bp_blogs_blog_after_save', $this );
-        
+
         if ( $this->id )
             return $this->id;
@@ -61 +61 @@
             return $wpdb->insert_id;
     }
-    
+
     function exists() {
         global $bp, $wpdb;
-        
+
         return $wpdb->get_var( $wpdb->prepare( "SELECT count(id) FROM {$bp->blogs->table_name} WHERE user_id = %d AND blog_id = %d", $this->user_id, $this->blog_id ) );
     }
-    
+
     /* Static Functions */
-    
+
     function delete_blog_for_all( $blog_id ) {
         global $wpdb, $bp;
-        
-        if ( !$bp->blogs )
-            bp_blogs_setup_globals();
-        
+
+        if ( !$bp->blogs )
+            bp_blogs_setup_globals();
+
         bp_blogs_delete_blogmeta( $blog_id );
 
         return $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->blogs->table_name} WHERE blog_id = %d", $blog_id ) );
     }
-    
+
     function delete_blog_for_user( $blog_id, $user_id = null ) {
         global $wpdb, $bp;
-        
-        if ( !$bp->blogs )
-            bp_blogs_setup_globals();
-        
+
+        if ( !$bp->blogs )
+            bp_blogs_setup_globals();
+
         if ( !$user_id )
             $user_id = $bp->loggedin_user->id;
@@ -92 +92 @@
         return $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->blogs->table_name} WHERE user_id = %d AND blog_id = %d", $user_id, $blog_id ) );
     }
-    
+
     function delete_blogs_for_user( $user_id = null ) {
         global $wpdb, $bp;
-        
+
         if ( !$bp->blogs )
             bp_blogs_setup_globals();
@@ -104 +104 @@
         return $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->blogs->table_name} WHERE user_id = %d", $user_id ) );
     }
-    
+
     function get_blogs_for_user( $user_id = null ) {
         global $bp, $wpdb;
-        
-        if ( !$bp->blogs )
-            bp_blogs_setup_globals();
-        
+
+        if ( !$bp->blogs )
+            bp_blogs_setup_globals();
+
         if ( !$user_id )
             $user_id = $bp->displayed_user->id;
-        
+
         // Show logged in users their hidden blogs.
         if ( !bp_is_home() )
-            $blog_ids = $wpdb->get_col( $wpdb->prepare( "SELECT DISTINCT b.blog_id FROM {$bp->blogs->table_name} b LEFT JOIN {$wpdb->base_prefix}blogs wb ON b.blog_id = wb.blog_id WHERE wb.public = 1 AND wb.deleted = 0 AND wb.spam = 0 AND wb.mature = 0 AND wb.archived = '0' AND b.user_id = %d ", $user_id) );
+            $blogs = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT b.id, bm1.meta_value as name, bm2.meta_value as description, wb.domain, wb.path FROM {$bp->blogs->table_name} b, {$wpdb->base_prefix}blogs wb, {$bp->blogs->table_name_blogmeta} bm1, {$bp->blogs->table_name_blogmeta} bm2 WHERE b.blog_id = wb.blog_id AND b.blog_id = bm1.blog_id AND b.blog_id = bm2.blog_id AND bm1.meta_key = 'name' AND bm2.meta_key = 'description' AND wb.public = 1 AND wb.deleted = 0 AND wb.spam = 0 AND wb.mature = 0 AND wb.archived = '0' AND b.user_id = %d ", $user_id) );
         else
-            $blog_ids = $wpdb->get_col( $wpdb->prepare( "SELECT DISTINCT b.blog_id FROM {$bp->blogs->table_name} b LEFT JOIN {$wpdb->base_prefix}blogs wb ON b.blog_id = wb.blog_id WHERE wb.deleted = 0 AND wb.spam = 0 AND wb.mature = 0 AND wb.archived = '0' AND b.user_id = %d ", $user_id) );
-            
+            $blogs = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT b.id, bm1.meta_value as name, bm2.meta_value as description, wb.domain, wb.path FROM {$bp->blogs->table_name} b, {$wpdb->base_prefix}blogs wb, {$bp->blogs->table_name_blogmeta} bm1, {$bp->blogs->table_name_blogmeta} bm2 WHERE b.blog_id = wb.blog_id AND b.blog_id = bm1.blog_id AND b.blog_id = bm2.blog_id AND bm1.meta_key = 'name' AND bm2.meta_key = 'description' AND wb.deleted = 0 AND wb.spam = 0 AND wb.mature = 0 AND wb.archived = '0' AND b.user_id = %d ", $user_id) );
+
         $total_blog_count = BP_Blogs_Blog::total_blog_count( $user_id );
-        
-        for ( $i = 0; $i < count($blog_ids); $i++ ) {
-            $blogs[] = array(
-                'id' => $blog_ids[$i],
-                'siteurl' => get_blog_option($blog_ids[$i], 'siteurl'),
-                'title' => get_blog_option($blog_ids[$i], 'blogname'),
-                'description' => get_blog_option($blog_ids[$i], 'blogdescription')
-            );
-        }
-
-        return array( 'blogs' => $blogs, 'count' => $total_blog_count );
-    }
-    
+
+        foreach ( (array)$blogs as $blog ) {
+            $user_blogs[$blog->id] = new stdClass;
+            $user_blogs[$blog->id]->id = $blog->id;
+            $user_blogs[$blog->id]->siteurl = ( is_ssl() ) ? 'https://' . $blog->domain . $blog->path : 'http://' . $blog->domain . $blog->path;
+            $user_blogs[$blog->id]->name = $blog->name;
+            $user_blogs[$blog->id]->description = $blog->description;
+        }
+
+        return array( 'blogs' => $user_blogs, 'count' => $total_blog_count );
+    }
+
     function is_recorded( $blog_id ) {
         global $bp, $wpdb;
-        
-        if ( !$bp->blogs )
-            bp_blogs_setup_globals();
-        
+
+        if ( !$bp->blogs )
+            bp_blogs_setup_globals();
+
         return $wpdb->get_var( $wpdb->prepare( "SELECT id FROM {$bp->blogs->table_name} WHERE blog_id = %d", $blog_id ) );
     }
-    
+
     function total_blog_count( $user_id = null ) {
         global $bp, $wpdb;
-        
-        if ( !$bp->blogs )
-            bp_blogs_setup_globals();
-        
+
+        if ( !$bp->blogs )
+            bp_blogs_setup_globals();
+
         if ( !$user_id )
             $user_id = $bp->displayed_user->id;
@@ -156 +155 @@
             return $wpdb->get_var( $wpdb->prepare( "SELECT DISTINCT count(b.blog_id) FROM {$bp->blogs->table_name} b LEFT JOIN {$wpdb->base_prefix}blogs wb ON b.blog_id = wb.blog_id WHERE wb.public = 1 AND wb.deleted = 0 AND wb.spam = 0 AND wb.mature = 0 AND wb.archived = '0' AND user_id = %d", $user_id) );
         else
-            return $wpdb->get_var( $wpdb->prepare( "SELECT DISTINCT count(b.blog_id) FROM {$bp->blogs->table_name} b LEFT JOIN {$wpdb->base_prefix}blogs wb ON b.blog_id = wb.blog_id WHERE wb.deleted = 0 AND wb.spam = 0 AND wb.mature = 0 AND wb.archived = '0' AND user_id = %d", $user_id) );          
-    }
-    
+            return $wpdb->get_var( $wpdb->prepare( "SELECT DISTINCT count(b.blog_id) FROM {$bp->blogs->table_name} b LEFT JOIN {$wpdb->base_prefix}blogs wb ON b.blog_id = wb.blog_id WHERE wb.deleted = 0 AND wb.spam = 0 AND wb.mature = 0 AND wb.archived = '0' AND user_id = %d", $user_id) );
+    }
+
     function get_all( $limit = null, $page = null ) {
         global $bp, $wpdb;
-        
-        if ( !$bp->blogs )
-            bp_blogs_setup_globals();
-        
+
+        if ( !$bp->blogs )
+            bp_blogs_setup_globals();
+
         if ( $limit && $page ) {
             $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
             $total_blogs = $wpdb->get_var( $wpdb->prepare( "SELECT DISTINCT count(bm.blog_id) FROM {$bp->blogs->table_name_blogmeta} bm LEFT JOIN {$wpdb->base_prefix}blogs wb ON bm.blog_id = wb.blog_id WHERE wb.public = 1 AND wb.archived = '0' AND wb.spam = 0 AND wb.mature = 0 AND wb.deleted = 0 AND bm.meta_key = 'last_activity' ORDER BY CONVERT(bm.meta_value, SIGNED) DESC" ) );
         }
-            
+
         $paged_blogs = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT bm.blog_id FROM {$bp->blogs->table_name_blogmeta} bm LEFT JOIN {$wpdb->base_prefix}blogs wb ON bm.blog_id = wb.blog_id WHERE wb.public = 1 AND wb.archived = '0' AND wb.spam = 0 AND wb.mature = 0 AND wb.deleted = 0 AND bm.meta_key = 'last_activity' ORDER BY CONVERT(bm.meta_value, SIGNED) DESC {$pag_sql}" ) );
 
         return array( 'blogs' => $paged_blogs, 'total' => $total_blogs );
     }
-    
+
     function get_by_letter( $letter, $limit = null, $page = null ) {
         global $bp, $wpdb;
-        
-        if ( !$bp->blogs )
-            bp_blogs_setup_globals();
-        
+
+        if ( !$bp->blogs )
+            bp_blogs_setup_globals();
+
         $letter = like_escape( $wpdb->escape( $letter ) );
-                
+
         if ( $limit && $page ) {
             $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
             $total_blogs = $wpdb->get_var( $wpdb->prepare( "SELECT DISTINCT count(bm.blog_id) FROM {$bp->blogs->table_name_blogmeta} bm LEFT JOIN {$wpdb->base_prefix}blogs wb ON bm.blog_id = wb.blog_id WHERE bm.meta_key = 'name' AND bm.meta_value LIKE '$letter%%' AND wb.public = 1 AND wb.mature = 0 AND wb.spam = 0 AND wb.archived = '0' AND wb.deleted = 0 ORDER BY bm.meta_value ASC" ) );
         }
-    
+
         $paged_blogs = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT bm.blog_id FROM {$bp->blogs->table_name_blogmeta} bm LEFT JOIN {$wpdb->base_prefix}blogs wb ON bm.blog_id = wb.blog_id WHERE bm.meta_key = 'name' AND bm.meta_value LIKE '$letter%%' AND wb.public = 1 AND wb.mature = 0 AND wb.spam = 0 AND wb.archived = '0' AND wb.deleted = 0 ORDER BY bm.meta_value ASC{$pag_sql}" ) );
-        
-        return array( 'blogs' => $paged_blogs, 'total' => $total_blogs );       
-    }
-    
+
+        return array( 'blogs' => $paged_blogs, 'total' => $total_blogs );
+    }
+
     function search_blogs( $filter, $limit = null, $page = null ) {
         global $wpdb, $bp;
-        
-        if ( !$bp->blogs )
-            bp_blogs_setup_globals();
-        
+
+        if ( !$bp->blogs )
+            bp_blogs_setup_globals();
+
         $filter = like_escape( $wpdb->escape( $filter ) );
-        
+
         if ( $limit && $page ) {
             $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
@@ -207 +206 @@
 
         $paged_blogs = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT bm.blog_id FROM {$bp->blogs->table_name_blogmeta} bm LEFT JOIN {$wpdb->base_prefix}blogs wb ON bm.blog_id = wb.blog_id WHERE ( ( bm.meta_key = 'name' OR bm.meta_key = 'description' ) AND bm.meta_value LIKE '%%$filter%%' ) AND wb.public = 1 AND wb.mature = 0 AND wb.spam = 0 AND wb.archived = '0' AND wb.deleted = 0 ORDER BY meta_value ASC{$pag_sql}" ) );
-        
-        return array( 'blogs' => $paged_blogs, 'total' => $total_blogs );       
-    }
-    
+
+        return array( 'blogs' => $paged_blogs, 'total' => $total_blogs );
+    }
+
     function get_random( $limit = null, $page = null ) {
         global $bp, $wpdb;
-        
-        if ( !$bp->blogs )
-            bp_blogs_setup_globals();
-        
+
+        if ( !$bp->blogs )
+            bp_blogs_setup_globals();
+
         if ( $limit && $page ) {
             $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
             $total_blogs = $wpdb->get_var( $wpdb->prepare( "SELECT DISTINCT count(b.blog_id) FROM {$bp->blogs->table_name} b LEFT JOIN {$wpdb->base_prefix}blogs wb ON b.blog_id = wb.blog_id WHERE wb.public = 1 AND wb.mature = 0 AND wb.spam = 0 AND wb.archived = '0' AND wb.deleted = 0 ORDER BY rand()" ) );
         }
-        
-        $paged_blogs = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT b.blog_id FROM {$bp->blogs->table_name} b LEFT JOIN {$wpdb->base_prefix}blogs wb ON b.blog_id = wb.blog_id WHERE wb.public = 1 AND wb.mature = 0 AND wb.spam = 0 AND wb.archived = '0' AND wb.deleted = 0  ORDER BY rand() {$pag_sql}" ) );         
-        
+
+        $paged_blogs = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT b.blog_id FROM {$bp->blogs->table_name} b LEFT JOIN {$wpdb->base_prefix}blogs wb ON b.blog_id = wb.blog_id WHERE wb.public = 1 AND wb.mature = 0 AND wb.spam = 0 AND wb.archived = '0' AND wb.deleted = 0  ORDER BY rand() {$pag_sql}" ) );
+
         return array( 'blogs' => $paged_blogs, 'total' => $total_blogs );
     }
-    
+
     function get_active( $limit = null, $page = null ) {
         global $bp, $wpdb;
-        
-        if ( !$bp->blogs )
-            bp_blogs_setup_globals();
-        
+
+        if ( !$bp->blogs )
+            bp_blogs_setup_globals();
+
         if ( $limit && $page ) {
             $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
             $total_blogs = $wpdb->get_var( $wpdb->prepare( "SELECT DISTINCT count(bm.blog_id) FROM {$bp->blogs->table_name_blogmeta} bm LEFT JOIN {$wpdb->base_prefix}blogs wb ON bm.blog_id = wb.blog_id WHERE wb.public = 1 AND wb.archived = '0' AND wb.spam = 0 AND wb.mature = 0 AND wb.deleted = 0 AND bm.meta_key = 'last_activity' ORDER BY CONVERT(bm.meta_value, SIGNED) DESC" ) );
         }
-            
+
         $paged_blogs = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT bm.blog_id FROM {$bp->blogs->table_name_blogmeta} bm LEFT JOIN {$wpdb->base_prefix}blogs wb ON bm.blog_id = wb.blog_id WHERE wb.public = 1 AND wb.archived = '0' AND wb.spam = 0 AND wb.mature = 0 AND wb.deleted = 0 AND bm.meta_key = 'last_activity' ORDER BY CONVERT(bm.meta_value, SIGNED) DESC {$pag_sql}" ) );
 
         return array( 'blogs' => $paged_blogs, 'total' => $total_blogs );
     }
-    
+
     function get_newest( $limit = null, $page = null ) {
         global $bp, $wpdb;
-        
-        if ( !$bp->blogs )
-            bp_blogs_setup_globals();
-        
+
+        if ( !$bp->blogs )
+            bp_blogs_setup_globals();
+
         if ( $limit && $page ) {
             $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
             $total_blogs = $wpdb->get_var( $wpdb->prepare( "SELECT DISTINCT count(wb.blog_id) FROM {$wpdb->base_prefix}blogs wb WHERE wb.public = 1 AND wb.archived = '0' AND wb.spam = 0 AND wb.mature = 0 AND wb.deleted = 0 ORDER BY wb.registered DESC" ) );
         }
-            
+
         $paged_blogs = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT wb.blog_id FROM {$wpdb->base_prefix}blogs wb WHERE wb.public = 1 AND wb.archived = '0' AND wb.spam = 0 AND wb.mature = 0 AND wb.deleted = 0 ORDER BY wb.registered DESC {$pag_sql}" ) );
 
         return array( 'blogs' => $paged_blogs, 'total' => $total_blogs );
     }
-    
+
     function is_hidden( $blog_id ) {
         global $wpdb;
@@ -264 +263 @@
         if ( !$bp->blogs )
             bp_blogs_setup_globals();
-        
+
         if ( !(int)$wpdb->get_var( $wpdb->prepare( "SELECT DISTINCT public FROM {$wpdb->base_prefix}blogs WHERE blog_id = %d", $blog_id ) ) )
             return true;
-        
+
         return false;
     }
@@ -278 +277 @@
     var $post_id;
     var $date_created;
-    
+
     function bp_blogs_post( $id = null, $blog_id = null, $post_id = null ) {
         global $bp, $wpdb;
@@ -297 +296 @@
         else
             $post = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$bp->blogs->table_name_blog_posts} WHERE blog_id = %d AND post_id = %d", $this->blog_id, $this->post_id ) );
-        
-        $this->id = $post->id;  
+
+        $this->id = $post->id;
         $this->user_id = $post->user_id;
         $this->blog_id = $post->blog_id;
@@ -304 +303 @@
         $this->date_created = $post->date_created;
     }
-    
+
     function save() {
         global $wpdb, $bp;
-        
+
         $this->post_id = apply_filters( 'bp_blogs_post_id_before_save', $this->post_id, $this->id );
         $this->blog_id = apply_filters( 'bp_blogs_post_blog_id_before_save', $this->blog_id, $this->id );
@@ -322 +321 @@
             $sql = $wpdb->prepare( "INSERT INTO {$bp->blogs->table_name_blog_posts} ( post_id, blog_id, user_id, date_created ) VALUES ( %d, %d, %d, FROM_UNIXTIME(%d) )", $this->post_id, $this->blog_id, $this->user_id, $this->date_created );
         }
-        
+
         if ( !$wpdb->query($sql) )
             return false;
 
         do_action( 'bp_blogs_post_after_save', $this );
-        
+
         if ( $this->id )
             return $this->id;
         else
-            return $wpdb->insert_id;    
-    }
-    
+            return $wpdb->insert_id;
+    }
+
     /* Static Functions */
-    
+
     function delete( $post_id, $blog_id ) {
         global $wpdb, $bp, $current_user;
-        
+
         if ( !$bp->blogs )
             bp_blogs_setup_globals();
@@ -344 +343 @@
         return $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->blogs->table_name_blog_posts} WHERE blog_id = %d AND post_id = %d", $blog_id, $post_id ) );
     }
-    
+
     function delete_oldest( $user_id = null ) {
         global $wpdb, $bp;
-        
-        if ( !$bp->blogs )
-            bp_blogs_setup_globals();
-        
+
+        if ( !$bp->blogs )
+            bp_blogs_setup_globals();
+
         if ( !$user_id )
             $user_id = $current_user->ID;
-            
-        return $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->blogs->table_name_blog_posts} WHERE user_id = %d ORDER BY date_created ASC LIMIT 1", $user_id ) );      
-    }
-    
+
+        return $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->blogs->table_name_blog_posts} WHERE user_id = %d ORDER BY date_created ASC LIMIT 1", $user_id ) );
+    }
+
     function delete_posts_for_user( $user_id = null ) {
         global $wpdb, $bp;
-        
+
         if ( !$bp->blogs )
             bp_blogs_setup_globals();
@@ -368 +367 @@
         return $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->blogs->table_name_blog_posts} WHERE user_id = %d", $user_id ) );
     }
-    
+
     function delete_posts_for_blog( $blog_id ) {
         global $wpdb, $bp;
-        
-        if ( !$bp->blogs )
-            bp_blogs_setup_globals();
-        
+
+        if ( !$bp->blogs )
+            bp_blogs_setup_globals();
+
         return $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->blogs->table_name_blog_posts} WHERE blog_id = %d", $blog_id ) );
     }
-    
+
     function get_latest_posts( $blog_id = null, $limit = 5 ) {
         global $wpdb, $bp;
-        
-        if ( !$bp->blogs )
-            bp_blogs_setup_globals();
-        
+
+        if ( !$bp->blogs )
+            bp_blogs_setup_globals();
+
         if ( $blog_id )
             $blog_sql = $wpdb->prepare( " AND p.blog_id = %d", $blog_id );
-        
+
         $post_ids = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT p.post_id, p.blog_id FROM {$bp->blogs->table_name_blog_posts} p LEFT JOIN {$wpdb->base_prefix}blogs b ON p.blog_id = b.blog_id WHERE b.public = 1 AND b.deleted = 0 AND b.archived = '0' AND b.spam = 0 AND b.mature = 0 $blog_sql ORDER BY p.date_created DESC LIMIT $limit" ) );
 
@@ -392 +391 @@
             $posts[$i] = BP_Blogs_Post::fetch_post_content($post_ids[$i]);
         }
-        
+
         return $posts;
     }
-    
+
     function get_posts_for_user( $user_id = null ) {
         global $bp, $wpdb;
-        
-        if ( !$bp->blogs )
-            bp_blogs_setup_globals();
-        
+
+        if ( !$bp->blogs )
+            bp_blogs_setup_globals();
+
         if ( !$user_id )
             $user_id = $bp->displayed_user->id;
-        
+
         // Show a logged in user their posts on private blogs, but not anyone else.
         if ( !bp_is_home() ) {
@@ -411 +410 @@
         } else {
             $post_ids = $wpdb->get_results( $wpdb->prepare( "SELECT p.post_id, p.blog_id FROM {$bp->blogs->table_name_blog_posts} p LEFT JOIN {$wpdb->base_prefix}blogs b ON p.blog_id = b.blog_id WHERE b.deleted = 0 AND b.archived = '0' AND b.spam = 0 AND b.mature = 0 AND p.user_id = %d ORDER BY p.date_created DESC", $user_id) );
-            $total_post_count = $wpdb->get_var( $wpdb->prepare( "SELECT count(p.post_id) FROM {$bp->blogs->table_name_blog_posts} p LEFT JOIN {$wpdb->base_prefix}blogs b ON p.blog_id = b.blog_id WHERE b.deleted = 0 AND b.archived = '0' AND b.spam = 0 AND b.mature = 0 AND p.user_id = %d", $user_id) );           
+            $total_post_count = $wpdb->get_var( $wpdb->prepare( "SELECT count(p.post_id) FROM {$bp->blogs->table_name_blog_posts} p LEFT JOIN {$wpdb->base_prefix}blogs b ON p.blog_id = b.blog_id WHERE b.deleted = 0 AND b.archived = '0' AND b.spam = 0 AND b.mature = 0 AND p.user_id = %d", $user_id) );
         }
 
@@ -420 +419 @@
         return array( 'posts' => $posts, 'count' => $total_post_count );
     }
-    
+
     function fetch_post_content( $post_object ) {
         // TODO: switch_to_blog() calls are expensive and this needs to be changed.
@@ -430 +429 @@
         return $post;
     }
-    
+
     function get_total_recorded_for_user( $user_id = null ) {
         global $bp, $wpdb;
-        
-        if ( !$bp->blogs )
-            bp_blogs_setup_globals();
-        
+
+        if ( !$bp->blogs )
+            bp_blogs_setup_globals();
+
         if ( !$user_id )
             $user_id = $current_user->ID;
@@ -442 +441 @@
         return $wpdb->get_var( $wpdb->prepare( "SELECT count(post_id) FROM {$bp->blogs->table_name_blog_posts} WHERE user_id = %d", $user_id ) );
     }
-    
+
     function is_recorded( $post_id, $blog_id, $user_id = null ) {
         global $bp, $wpdb, $current_user;
-        
-        if ( !$bp->blogs )
-            bp_blogs_setup_globals();
-        
+
+        if ( !$bp->blogs )
+            bp_blogs_setup_globals();
+
         if ( !$user_id )
             $user_id = $current_user->ID;
-        
+
         return $wpdb->get_var( $wpdb->prepare( "SELECT post_id FROM {$bp->blogs->table_name_blog_posts} WHERE post_id = %d AND blog_id = %d AND user_id = %d", $post_id, $blog_id, $user_id ) );
     }
-    
+
     function total_post_count( $blog_id ) {
         global $bp, $wpdb;
-        
-        if ( !$bp->blogs )
-            bp_blogs_setup_globals();
-        
+
+        if ( !$bp->blogs )
+            bp_blogs_setup_globals();
+
         if ( !$blog_id )
             return false;
-            
-        return $wpdb->get_var( $wpdb->prepare( "SELECT count(post_id) FROM {$bp->blogs->table_name_blog_posts} WHERE blog_id = %d", $blog_id ) );       
-    }
-    
+
+        return $wpdb->get_var( $wpdb->prepare( "SELECT count(post_id) FROM {$bp->blogs->table_name_blog_posts} WHERE blog_id = %d", $blog_id ) );
+    }
+
     function get_all() {
         global $bp, $wpdb;
-        
-        if ( !$bp->blogs )
-            bp_blogs_setup_globals();
-        
+
+        if ( !$bp->blogs )
+            bp_blogs_setup_globals();
+
         return $wpdb->get_col( $wpdb->prepare( "SELECT post_id, blog_id FROM " . $bp->blogs->table_name_blog_posts ) );
     }
-    
+
 }
 
@@ -485 +484 @@
     var $comment_post_id;
     var $date_created;
-    
+
     function bp_blogs_comment( $id = false, $blog_id = false, $comment_id = false ) {
         global $bp, $wpdb;
@@ -491 +490 @@
         if ( !$user_id )
             $user_id = $bp->displayed_user->id;
-            
+
         if ( $id || ( !$id && $blog_id && $comment_id ) ) {
             $this->id = $id;
@@ -502 +501 @@
     function populate() {
         global $wpdb, $bp;
-        
+
         if ( $this->id )
             $comment = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$bp->blogs->table_name_blog_comments} WHERE id = %d", $this->id ) );
         else
             $comment = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$bp->blogs->table_name_blog_comments} WHERE blog_id = %d AND comment_id = %d", (int)$this->blog_id, (int)$this->comment_id ) );
-        
+
         $this->comment_id = $comment->comment_id;
         $this->user_id = $comment->user_id;
@@ -514 +513 @@
         $this->date_created = $comment->date_created;
     }
-    
+
     function save() {
         global $wpdb, $bp;
@@ -525 +524 @@
 
         do_action( 'bp_blogs_comment_before_save', $this );
-        
+
         if ( $this->id ) {
             // Update
@@ -536 +535 @@
         if ( !$wpdb->query($sql) )
             return false;
-            
+
         do_action( 'bp_blogs_comment_after_save', $this );
-        
+
         if ( $this->id )
             return $this->id;
         else
-            return $wpdb->insert_id;    
+            return $wpdb->insert_id;
     }
 
     /* Static Functions */
-    
+
     function delete( $comment_id, $blog_id ) {
         global $wpdb, $bp, $current_user;
-        
-        if ( !$bp->blogs )
-            bp_blogs_setup_globals();
-            
+
+        if ( !$bp->blogs )
+            bp_blogs_setup_globals();
+
         return $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->blogs->table_name_blog_comments} WHERE comment_id = %d AND blog_id = %d", $comment_id, $blog_id ) );
     }
-    
+
     function delete_oldest( $user_id = null ) {
         global $wpdb, $bp, $current_user;
-        
-        if ( !$bp->blogs )
-            bp_blogs_setup_globals();
-        
+
+        if ( !$bp->blogs )
+            bp_blogs_setup_globals();
+
         if ( !$user_id )
             $user_id = $current_user->ID;
-            
-        return $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->blogs->table_name_blog_comments} WHERE user_id = %d ORDER BY date_created ASC LIMIT 1", $user_id ) );       
-    }
-    
+
+        return $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->blogs->table_name_blog_comments} WHERE user_id = %d ORDER BY date_created ASC LIMIT 1", $user_id ) );
+    }
+
     function delete_comments_for_user( $user_id = null ) {
         global $wpdb, $bp;
-        
+
         if ( !$bp->blogs )
             bp_blogs_setup_globals();
@@ -579 +578 @@
         return $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->blogs->table_name_blog_comments} WHERE user_id = %d", $user_id ) );
     }
-    
+
     function delete_comments_for_blog( $blog_id ) {
         global $wpdb, $bp;
-        
-        if ( !$bp->blogs )
-            bp_blogs_setup_globals();
-        
+
+        if ( !$bp->blogs )
+            bp_blogs_setup_globals();
+
         return $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->blogs->table_name_blog_comments} WHERE blog_id = %d", $blog_id ) );
     }
-    
+
     function get_comments_for_user( $user_id = null ) {
         global $bp, $wpdb;
-        
+
         if ( !$bp->blogs )
             bp_blogs_setup_globals();
@@ -597 +596 @@
         if ( !$user_id )
             $user_id = $bp->displayed_user->id;
-            
+
         // Show the logged in user their comments on hidden blogs, but not to anyone else.
         if ( !bp_is_home() ) {
@@ -604 +603 @@
         } else {
             $comment_ids = $wpdb->get_results( $wpdb->prepare( "SELECT c.comment_id, c.blog_id FROM {$bp->blogs->table_name_blog_comments} c LEFT JOIN {$wpdb->base_prefix}blogs b ON c.blog_id = b.blog_id WHERE b.deleted = 0 AND b.archived = '0' AND b.spam = 0 AND b.mature = 0 AND c.user_id = %d ORDER BY c.date_created ASC", $user_id) );
-            $total_comment_count = $wpdb->get_var( $wpdb->prepare( "SELECT count(c.comment_id) FROM {$bp->blogs->table_name_blog_comments} c LEFT JOIN {$wpdb->base_prefix}blogs b ON c.blog_id = b.blog_id WHERE b.deleted = 0 AND b.archived = '0' AND b.spam = 0 AND b.mature = 0 AND c.user_id = %d", $user_id) );          
-        }
-        
+            $total_comment_count = $wpdb->get_var( $wpdb->prepare( "SELECT count(c.comment_id) FROM {$bp->blogs->table_name_blog_comments} c LEFT JOIN {$wpdb->base_prefix}blogs b ON c.blog_id = b.blog_id WHERE b.deleted = 0 AND b.archived = '0' AND b.spam = 0 AND b.mature = 0 AND c.user_id = %d", $user_id) );
+        }
+
         for ( $i = 0; $i < count($comment_ids); $i++ ) {
             $comments[$i] = BP_Blogs_Comment::fetch_comment_content($comment_ids[$i]);
@@ -613 +612 @@
         return array( 'comments' => $comments, 'count' => $total_comment_count );
     }
-    
-    function fetch_comment_content( $comment_object ) { 
+
+    function fetch_comment_content( $comment_object ) {
         switch_to_blog($comment_object->blog_id);
         $comment = get_comment($comment_object->comment_id);
@@ -620 +619 @@
         $comment->post = &get_post( $comment->comment_post_ID );
         restore_current_blog();
-        
+
         return $comment;
     }
-    
+
     function get_total_recorded_for_user( $user_id = null ) {
         global $bp, $wpdb, $current_user;
-        
-        if ( !$bp->blogs )
-            bp_blogs_setup_globals();
-        
+
+        if ( !$bp->blogs )
+            bp_blogs_setup_globals();
+
         if ( !$user_id )
             $user_id = $current_user->ID;
@@ -635 +634 @@
         return $wpdb->get_var( $wpdb->prepare( "SELECT count(comment_id) FROM {$bp->blogs->table_name_blog_comments} WHERE user_id = %d", $user_id ) );
     }
-    
+
     function total_comment_count( $blog_id, $post_id ) {
         global $bp, $wpdb;
-        
-        if ( !$bp->blogs )
-            bp_blogs_setup_globals();
-            
+
+        if ( !$bp->blogs )
+            bp_blogs_setup_globals();
+
         if ( $post_id )
             $post_sql = $wpdb->prepare( " AND comment_post_id = %d", $post_id );
@@ -647 +646 @@
         return $wpdb->get_var( $wpdb->prepare( "SELECT count(comment_id) WHERE blog_id = %d{$post_sql}", $blog_id ) );
     }
-    
-    
+
+
     function is_recorded( $comment_id, $comment_post_id, $blog_id, $user_id = null ) {
         global $bp, $wpdb, $current_user;
-        
-        if ( !$bp->blogs )
-            bp_blogs_setup_globals();
-            
+
+        if ( !$bp->blogs )
+            bp_blogs_setup_globals();
+
         if ( !$user_id )
             $user_id = $current_user->ID;
-        
+
         return $wpdb->get_var( $wpdb->prepare( "SELECT comment_id FROM {$bp->blogs->table_name_blog_comments} WHERE comment_id = %d AND blog_id = %d AND comment_post_id = %d AND user_id = %d", $comment_id, $blog_id, $comment_post_id, $user_id ) );
     }
-    
+
 }
 

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

@@ -132 +132 @@
 
             if ( !$blogs = wp_cache_get( 'bp_blogs_of_user_' . $bp->loggedin_user->id, 'bp' ) ) {
-                $blogs = get_blogs_of_user( $bp->loggedin_user->id );
+                $blogs = bp_blogs_get_blogs_for_user( $bp->loggedin_user->id );
                 wp_cache_set( 'bp_blogs_of_user_' . $bp->loggedin_user->id, $blogs, 'bp' );
             }
@@ -143 +143 @@
 
             echo '<ul>';
-            if ( is_array( $blogs )) {
+
+            if ( is_array( $blogs['blogs'] ) && (int)$blogs['count'] ) {
 
                 $counter = 0;
-                foreach( $blogs as $blog ) {
-                    $role = get_blog_role_for_user( $bp->loggedin_user->id, $blog->userblog_id );
+                foreach ( $blogs['blogs'] as $blog ) {
+                    $role = get_blog_role_for_user( $bp->loggedin_user->id, $blog->id );
 
                     $alt = ( 0 == $counter % 2 ) ? ' class="alt"' : '';
                     echo '<li' . $alt . '>';
-                    echo '<a href="' . $blog->siteurl . '">' . $blog->blogname . ' (' . $role . ')</a>';
+                    echo '<a href="' . $blog->siteurl . '">' . $blog->name . ' (' . $role . ')</a>';
                     if ( !( 'Subscriber' == $role ) ) { // then they have something to display on the flyout menu
                         echo '<ul>';
-                        echo '<li class="alt"><a href="' . $blog->siteurl  . '/wp-admin/">' . __('Dashboard', 'buddypress') . '</a></li>';
-                        echo '<li><a href="' . $blog->siteurl  . '/wp-admin/post-new.php">' . __('New Post', 'buddypress') . '</a></li>';
-                        echo '<li class="alt"><a href="' . $blog->siteurl  . '/wp-admin/edit.php">' . __('Manage Posts', 'buddypress') . '</a></li>';
-                        echo '<li><a href="' . $blog->siteurl  . '/wp-admin/edit-comments.php">' . __('Manage Comments', 'buddypress') . '</a></li>';
+                        echo '<li class="alt"><a href="' . $blog->siteurl  . 'wp-admin/">' . __('Dashboard', 'buddypress') . '</a></li>';
+                        echo '<li><a href="' . $blog->siteurl  . 'wp-admin/post-new.php">' . __('New Post', 'buddypress') . '</a></li>';
+                        echo '<li class="alt"><a href="' . $blog->siteurl  . 'wp-admin/edit.php">' . __('Manage Posts', 'buddypress') . '</a></li>';
+                        echo '<li><a href="' . $blog->siteurl  . 'wp-admin/edit-comments.php">' . __('Manage Comments', 'buddypress') . '</a></li>';
                         if ( 'Admin' == $role ) {
-                            echo '<li class="alt"><a href="' . $blog->siteurl  . '/wp-admin/themes.php">' . __('Switch Theme', 'buddypress') . '</a></li>';
+                            echo '<li class="alt"><a href="' . $blog->siteurl  . 'wp-admin/themes.php">' . __('Switch Theme', 'buddypress') . '</a></li>';
                         }
                         echo '</ul>';