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

Timestamp:

05/20/2011 07:13:33 PM (15 years ago)

Author:

djpaul

Message:

Remove calls to 1.2-era _setup_globals(); the functions have been removed

File:

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

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

@@ -75 +75 @@
     function get( $type, $limit = false, $page = false, $user_id = 0, $search_terms = false ) {
         global $bp, $wpdb;
-
-        if ( !$bp->blogs )
-            bp_blogs_setup_globals();
 
         if ( !is_user_logged_in() || ( !is_super_admin() && ( $user_id != $bp->loggedin_user->id ) ) )
@@ -126 +123 @@
         global $wpdb, $bp;
 
-        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 ) );
     }
@@ -137 +130 @@
         global $wpdb, $bp;
 
-        if ( !$bp->blogs )
-            bp_blogs_setup_globals();
-
         if ( !$user_id )
             $user_id = $bp->loggedin_user->id;
@@ -149 +139 @@
         global $wpdb, $bp;
 
-        if ( !$bp->blogs )
-            bp_blogs_setup_globals();
-
         if ( !$user_id )
             $user_id = $bp->loggedin_user->id;
@@ -160 +147 @@
     function get_blogs_for_user( $user_id = 0, $show_hidden = false ) {
         global $bp, $wpdb;
-
-        if ( !$bp->blogs )
-            bp_blogs_setup_globals();
 
         if ( !$user_id )
@@ -190 +174 @@
         global $bp, $wpdb;
 
-        if ( !$bp->blogs )
-            bp_blogs_setup_globals();
-
         if ( !$user_id )
             $user_id = $bp->displayed_user->id;
@@ -202 +183 @@
         global $bp, $wpdb;
 
-        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 ) );
     }
@@ -210 +188 @@
     function total_blog_count_for_user( $user_id = null ) {
         global $bp, $wpdb;
-
-        if ( !$bp->blogs )
-            bp_blogs_setup_globals();
 
         if ( !$user_id )
@@ -227 +202 @@
         global $wpdb, $bp;
 
-        if ( !$bp->blogs )
-            bp_blogs_setup_globals();
-
         $filter = like_escape( $wpdb->escape( $filter ) );
 
@@ -247 +219 @@
         global $bp, $wpdb;
 
-        if ( !$bp->blogs )
-            bp_blogs_setup_globals();
-
         $hidden_sql = !is_super_admin() ? "AND wb.public = 1" : '';
-
         $pag_sql = ( $limit && $page ) ? $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) ) : '';
 
@@ -262 +230 @@
     function get_by_letter( $letter, $limit = null, $page = null ) {
         global $bp, $wpdb;
-
-        if ( !$bp->blogs )
-            bp_blogs_setup_globals();
 
         $letter = like_escape( $wpdb->escape( $letter ) );
@@ -307 +272 @@
         global $wpdb;
 
-        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;
@@ -316 +278 @@
     }
 }
-
 ?>