Changeset 3553 for trunk/bp-blogs/bp-blogs-classes.php

Timestamp:

12/22/2010 12:50:41 AM (15 years ago)

Author:

boonebgorges

Message:

Fixes WP_DEBUG warnings in bp-blogs-classes.php

File:

• trunk/bp-blogs/bp-blogs-classes.php (modified) (3 diffs)

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

@@ -78 +78 @@
         if ( !is_user_logged_in() || ( !is_super_admin() && ( $user_id != $bp->loggedin_user->id ) ) )
             $hidden_sql = "AND wb.public = 1";
-
-        if ( $limit && $page )
-            $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
-
-        if ( $user_id )
-            $user_sql = $wpdb->prepare( " AND b.user_id = %d", $user_id );
+        else
+            $hidden_sql = '';
+
+        $pag_sql = ( $limit && $page ) ? $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) ) : '';
+
+        $user_sql = !empty( $user_id ) ? $wpdb->prepare( " AND b.user_id = %d", $user_id ) : '';
 
         switch ( $type ) {
@@ -109 +109 @@
         }
 
-        foreach ( (array)$paged_blogs as $blog ) $blog_ids[] = $blog->blog_id;
+        $blog_ids = array();
+        foreach ( (array)$paged_blogs as $blog ) {
+            $blog_ids[] = $blog->blog_id;
+        }
+        
         $blog_ids = $wpdb->escape( join( ',', (array)$blog_ids ) );
         $paged_blogs = BP_Blogs_Blog::get_blog_extras( &$paged_blogs, $blog_ids, $type );
@@ -243 +247 @@
             bp_blogs_setup_globals();
 
-        if ( !is_super_admin() )
-            $hidden_sql = "AND wb.public = 1";
-
-        if ( $limit && $page )
-            $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
+        $hidden_sql = !is_super_admin() ? "AND wb.public = 1" : '';
+
+        $pag_sql = ( $limit && $page ) ? $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) ) : '';
 
         $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.mature = 0 AND wb.spam = 0 AND wb.archived = '0' AND wb.deleted = 0 {$hidden_sql} {$pag_sql}" ) );