Changeset 2077 for trunk/bp-blogs.php

Timestamp:

11/02/2009 07:54:21 PM (17 years ago)

Author:

apeatling

Message:

Merging 1.1 branch changes and syncing.

File:

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

trunk/bp-blogs.php

@@ -13 +13 @@
 /* Include deprecated functions if settings allow */
 if ( !defined( 'BP_IGNORE_DEPRECATED' ) )
-        require ( BP_PLUGIN_DIR . '/bp-blogs/deprecated/bp-blogs-deprecated.php' );     
-        
+        require ( BP_PLUGIN_DIR . '/bp-blogs/deprecated/bp-blogs-deprecated.php' );
+
 function bp_blogs_install() {
         global $wpdb, $bp;
-        
+
         if ( !empty($wpdb->charset) )
                 $charset_collate = "DEFAULT CHARACTER SET $wpdb->charset";
-        
+
         $sql[] = "CREATE TABLE {$bp->blogs->table_name} (
                                 id bigint(20) NOT NULL AUTO_INCREMENT PRIMARY KEY,
@@ -52 +52 @@
                                 KEY comment_post_id (comment_post_id)
                          ) {$charset_collate};";
-        
+
         $sql[] = "CREATE TABLE {$bp->blogs->table_name_blogmeta} (
                         id bigint(20) NOT NULL AUTO_INCREMENT PRIMARY KEY,
@@ -61 +61 @@
                         KEY meta_key (meta_key)
                    ) {$charset_collate};";
-                
-        
+
+
         require_once(ABSPATH . 'wp-admin/upgrade-functions.php');
 
@@ -69 +69 @@
         // On first installation - record all existing blogs in the system.
         if ( !(int)get_site_option( 'bp-blogs-first-install') ) {
-                
+
                 bp_blogs_record_existing_blogs();
                 add_site_option( 'bp-blogs-first-install', 1 );
-                
+
         } else {
-                
-                // Import blog titles and descriptions into the blogmeta table  
+
+                // Import blog titles and descriptions into the blogmeta table
                 if ( get_site_option( 'bp-blogs-version' ) <= '0.1.5' ) {
                         $blog_ids = $wpdb->get_col( $wpdb->prepare( "SELECT blog_id FROM " . $bp->blogs->table_name ) );
@@ -82 +82 @@
                                 $name = get_blog_option( $blog_ids[$i], 'blogname' );
                                 $desc = get_blog_option( $blog_ids[$i], 'blogdescription' );
-                                
+
                                 bp_blogs_update_blogmeta( $blog_ids[$i], 'name', $name );
                                 bp_blogs_update_blogmeta( $blog_ids[$i], 'description', $desc );
@@ -88 +88 @@
                         }
                 }
-                
-        }
-        
+
+        }
+
         update_site_option( 'bp-blogs-db-version', BP_BLOGS_DB_VERSION );
 }
 
-function bp_blogs_check_installed() {   
+function bp_blogs_check_installed() {
         global $wpdb, $bp, $userdata;
-        
+
         if ( is_site_admin() ) {
                 /* Need to check db tables exist, activate hook no-worky in mu-plugins folder. */
@@ -107 +107 @@
 function bp_blogs_setup_globals() {
         global $bp, $wpdb;
-        
+
         /* For internal identification */
         $bp->blogs->id = 'blogs';
-        
+
         $bp->blogs->table_name = $wpdb->base_prefix . 'bp_user_blogs';
         $bp->blogs->table_name_blog_posts = $wpdb->base_prefix . 'bp_user_blogs_posts';
@@ -117 +117 @@
         $bp->blogs->format_notification_function = 'bp_blogs_format_notifications';
         $bp->blogs->slug = BP_BLOGS_SLUG;
-        
+
         /* Register this in the active components array */
         $bp->active_components[$bp->blogs->slug] = $bp->blogs->id;
@@ -123 +123 @@
         do_action( 'bp_blogs_setup_globals' );
 }
-add_action( 'plugins_loaded', 'bp_blogs_setup_globals', 5 );    
+add_action( 'plugins_loaded', 'bp_blogs_setup_globals', 5 );
 add_action( 'admin_menu', 'bp_blogs_setup_globals', 2 );
 
@@ -136 +136 @@
  *
  * Adds "Blog" to the navigation arrays for the current and logged in user.
- * 
+ *
  * @package BuddyPress Blogs
  * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
@@ -143 +143 @@
 function bp_blogs_setup_nav() {
         global $bp;
-        
+
         /* Add 'Blogs' to the main navigation */
         bp_core_new_nav_item( array( 'name' => __( 'Blogs', 'buddypress' ), 'slug' => $bp->blogs->slug, 'position' => 30, 'screen_function' => 'bp_blogs_screen_my_blogs', 'default_subnav_slug' => 'my-blogs', 'item_css_id' => $bp->blogs->id ) );
-        
+
         $blogs_link = $bp->loggedin_user->domain . $bp->blogs->slug . '/';
-        
+
         /* Add the subnav items to the blogs nav item */
         bp_core_new_subnav_item( array( 'name' => __( 'My Blogs', 'buddypress' ), 'slug' => 'my-blogs', 'parent_url' => $blogs_link, 'parent_slug' => $bp->blogs->slug, 'screen_function' => 'bp_blogs_screen_my_blogs', 'position' => 10, 'item_css_id' => 'my-blogs-list' ) );
@@ -159 +159 @@
                 if ( bp_is_home() ) {
                         if ( function_exists('xprofile_setup_nav') ) {
-                                $bp->bp_options_title = __('My Blogs', 'buddypress'); 
+                                $bp->bp_options_title = __('My Blogs', 'buddypress');
                         }
                 } else {
                         /* If we are not viewing the logged in user, set up the current users avatar and name */
                         $bp->bp_options_avatar = bp_core_fetch_avatar( array( 'item_id' => $bp->displayed_user->id, 'type' => 'thumb' ) );
-                        $bp->bp_options_title = $bp->displayed_user->fullname; 
+                        $bp->bp_options_title = $bp->displayed_user->fullname;
                 }
         }
-        
+
         do_action( 'bp_blogs_setup_nav' );
 }
@@ -178 +178 @@
         if ( $bp->current_component == $bp->blogs->slug && empty( $bp->current_action ) ) {
                 $bp->is_directory = true;
-                
+
                 do_action( 'bp_blogs_directory_blogs_setup' );
                 bp_core_load_template( apply_filters( 'bp_blogs_template_directory_blogs_setup', 'directories/blogs/index' ) );
@@ -196 +196 @@
 function bp_blogs_screen_my_blogs() {
         do_action( 'bp_blogs_screen_my_blogs' );
-        bp_core_load_template( apply_filters( 'bp_blogs_template_my_blogs', 'blogs/my-blogs' ) );       
+        bp_core_load_template( apply_filters( 'bp_blogs_template_my_blogs', 'blogs/my-blogs' ) );
 }
 
@@ -224 +224 @@
 function bp_blogs_register_activity_actions() {
         global $bp;
-        
+
         if ( !function_exists( 'bp_activity_set_action' ) )
                 return false;
@@ -238 +238 @@
 function bp_blogs_record_activity( $args = '' ) {
         global $bp;
-        
+
         if ( !function_exists( 'bp_activity_add' ) )
                 return false;
-                
+
         /* Because blog, comment, and blog post code execution happens before anything else
            we may need to manually instantiate the activity component globals */
         if ( !$bp->activity && function_exists('bp_activity_setup_globals') )
                 bp_activity_setup_globals();
-                
+
         $defaults = array(
                 'user_id' => $bp->loggedin_user->id,
@@ -260 +260 @@
 
         $r = wp_parse_args( $args, $defaults );
-        extract( $r, EXTR_SKIP );       
-        
+        extract( $r, EXTR_SKIP );
+
         return bp_activity_add( array( 'user_id' => $user_id, 'content' => $content, 'primary_link' => $primary_link, 'component_name' => $component_name, 'component_action' => $component_action, 'item_id' => $item_id, 'secondary_item_id' => $secondary_item_id, 'recorded_time' => $recorded_time, 'hide_sitewide' => $hide_sitewide ) );
 }
@@ -268 +268 @@
         if ( function_exists('bp_activity_delete_by_item_id') ) {
                 extract($args);
-                
-                bp_activity_delete_by_item_id( array( 
-                        'item_id' => $item_id, 
+
+                bp_activity_delete_by_item_id( array(
+                        'item_id' => $item_id,
                         'component_name' => $component_name,
-                        'component_action' => $component_action, 
+                        'component_action' => $component_action,
                         'user_id' => $user_id,
                         'secondary_item_id' => $secondary_item_id
@@ -292 +292 @@
 
         $blog_ids = $wpdb->get_col( $wpdb->prepare( "SELECT blog_id FROM {$wpdb->base_prefix}blogs WHERE public = 1 AND mature = 0 AND spam = 0 AND deleted = 0" ) );
-        
+
         if ( $blog_ids ) {
                 foreach( $blog_ids as $blog_id ) {
@@ -311 +311 @@
 function bp_blogs_record_blog( $blog_id, $user_id, $no_activity = true ) {
         global $bp;
-        
+
         if ( !$user_id )
                 $user_id = $bp->loggedin_user->id;
-        
+
         $name = get_blog_option( $blog_id, 'blogname' );
         $description = get_blog_option( $blog_id, 'blogdescription' );
-        
+
         $recorded_blog = new BP_Blogs_Blog;
         $recorded_blog->user_id = $user_id;
@@ -323 +323 @@
 
         $recorded_blog_id = $recorded_blog->save();
-        
+
         bp_blogs_update_blogmeta( $recorded_blog->blog_id, 'name', $name );
         bp_blogs_update_blogmeta( $recorded_blog->blog_id, 'description', $description );
         bp_blogs_update_blogmeta( $recorded_blog->blog_id, 'last_activity', time() );
-        
+
         /* Only record this activity if the blog is public */
         if ( (int)$_POST['blog_public'] || !$no_activity ) {
@@ -333 +333 @@
                 bp_blogs_record_activity( array(
                         'user_id' => $recorded_blog->user_id,
-                        'content' => apply_filters( 'bp_blogs_activity_created_blog', sprintf( __( '%s created the blog %s', 'buddypress'), bp_core_get_userlink( $recorded_blog->user_id ), '<a href="' . get_blog_option( $recorded_blog->blog_id, 'siteurl' ) . '">' . attribute_escape( $name ) . '</a>' ), &$recorded_blog, $name, $description ), 
+                        'content' => apply_filters( 'bp_blogs_activity_created_blog', sprintf( __( '%s created the blog %s', 'buddypress'), bp_core_get_userlink( $recorded_blog->user_id ), '<a href="' . get_blog_option( $recorded_blog->blog_id, 'siteurl' ) . '">' . attribute_escape( $name ) . '</a>' ), &$recorded_blog, $name, $description ),
                         'primary_link' => apply_filters( 'bp_blogs_activity_created_blog_primary_link', get_blog_option( $recorded_blog->blog_id, 'siteurl' ), $recorded_blog->blog_id ),
                         'component_action' => 'new_blog',
@@ -339 +339 @@
                 ) );
         }
-        
+
         do_action( 'bp_blogs_new_blog', &$recorded_blog, $is_private, $is_recorded );
 }
@@ -346 +346 @@
 function bp_blogs_record_post( $post_id, $post, $user_id = false ) {
         global $bp, $wpdb;
-        
+
         $post_id = (int)$post_id;
         $blog_id = (int)$wpdb->blogid;
-        
+
         if ( !$user_id )
                 $user_id = (int)$post->post_author;
-        
         /* This is to stop infinate loops with Donncha's sitewide tags plugin */
         if ( (int)get_site_option( 'tags_blog_id' ) == (int)$blog_id )
                 return false;
-        
+
         /* Don't record this if it's not a post */
         if ( $post->post_type != 'post' )
                 return false;
-        
+
         if ( !$is_recorded = BP_Blogs_Post::is_recorded( $post_id, $blog_id, $user_id ) ) {
                 if ( 'publish' == $post->post_status && '' == $post->post_password ) {
-                        
+
                         $recorded_post = new BP_Blogs_Post;
                         $recorded_post->user_id = $user_id;
@@ -369 +368 @@
                         $recorded_post->post_id = $post_id;
                         $recorded_post->date_created = strtotime( $post->post_date );
-                        
+
                         $recorded_post_id = $recorded_post->save();
-                        
+
                         bp_blogs_update_blogmeta( $recorded_post->blog_id, 'last_activity', time() );
 
@@ -380 +379 @@
                                 $activity_content = sprintf( __( '%s wrote a new blog post: %s', 'buddypress' ), bp_core_get_userlink( (int)$post->post_author ), '<a href="' . $post_permalink . '">' . $post->post_title . '</a>' );
                                 $activity_content .= "<blockquote>" . bp_create_excerpt( $post->post_content ) . "</blockquote>";
-                        
+
                                 bp_blogs_record_activity( array(
                                         'user_id' => (int)$post->post_author,
-                                        'content' => apply_filters( 'bp_blogs_activity_new_post', $activity_content, &$post, $post_permalink ), 
+                                        'content' => apply_filters( 'bp_blogs_activity_new_post', $activity_content, &$post, $post_permalink ),
                                         'primary_link' => apply_filters( 'bp_blogs_activity_new_post_primary_link', $post_permalink, $post_id ),
                                         'component_action' => 'new_blog_post',
@@ -399 +398 @@
                 /* Delete the recorded post if the status is not published or it is password protected */
                 if ( 'publish' != $post->post_status || '' != $post->post_password ) {
-                        return bp_blogs_remove_post( $post_id, $blog_id, $existing_post );                      
-                
+                        return bp_blogs_remove_post( $post_id, $blog_id, $existing_post );
+
                 /* If the post author has changed, delete the post and re-add it. */
                 } else if ( (int)$existing_post->user_id != (int)$post->post_author ) {
                         // Delete the existing recorded post
                         bp_blogs_remove_post( $post_id, $blog_id, $existing_post );
-                        
+
                         // Re-record the post with the new author.
-                        bp_blogs_record_post( $post_id );                               
+                        bp_blogs_record_post( $post_id );
                 }
 
                 if ( (int)get_blog_option( $blog_id, 'blog_public' ) ) {
-                        /* Now re-record the post in the activity streams */            
+                        /* Now re-record the post in the activity streams */
                         $post_permalink = bp_post_get_permalink( $post, $blog_id );
 
                         $activity_content = sprintf( __( '%s wrote a new blog post: %s', 'buddypress' ), bp_core_get_userlink( (int)$post->post_author ), '<a href="' . $post_permalink . '">' . $post->post_title . '</a>' );
                         $activity_content .= "<blockquote>" . bp_create_excerpt( $post->post_content ) . "</blockquote>";
-                
+
                         /* Record this in activity streams */
                         bp_blogs_record_activity( array(
                                 'user_id' => (int)$post->post_author,
-                                'content' => apply_filters( 'bp_blogs_activity_new_post', $activity_content, &$post, $post_permalink ), 
+                                'content' => apply_filters( 'bp_blogs_activity_new_post', $activity_content, &$post, $post_permalink ),
                                 'primary_link' => apply_filters( 'bp_blogs_activity_new_post_primary_link', $post_permalink, $post_id ),
                                 'component_action' => 'new_blog_post',
@@ -435 +434 @@
 function bp_blogs_record_comment( $comment_id, $is_approved ) {
         global $wpdb, $bp;
-        
+
         if ( !$is_approved )
                 return false;
-                
+
         $comment = get_comment($comment_id);
         $comment->post = get_post( $comment->comment_post_ID );
-        
+
         /* Get the user_id from the author email. */
         $user = get_user_by_email( $comment->comment_author_email );
         $user_id = (int)$user->ID;
-        
+
         if ( !$user_id )
                 return false;
@@ -457 +456 @@
 
         $recorded_commment_id = $recorded_comment->save();
-        
+
         bp_blogs_update_blogmeta( $recorded_comment->blog_id, 'last_activity', time() );
 
@@ -463 +462 @@
                 /* Record in activity streams */
                 $comment_link = bp_post_get_permalink( $comment->post, $recorded_comment->blog_id );
-                $activity_content = sprintf( __( '%s commented on the blog post %s', 'buddypress' ), bp_core_get_userlink( $user_id ), '<a href="' . $comment_link . '#comment-' . $comment->comment_ID . '">' . $comment->post->post_title . '</a>' );                 
+                $activity_content = sprintf( __( '%s commented on the blog post %s', 'buddypress' ), bp_core_get_userlink( $user_id ), '<a href="' . $comment_link . '#comment-' . $comment->comment_ID . '">' . $comment->post->post_title . '</a>' );
                 $activity_content .= '<blockquote>' . bp_create_excerpt( $comment->comment_content ) . '</blockquote>';
 
@@ -469 +468 @@
                 bp_blogs_record_activity( array(
                         'user_id' => $recorded_comment->user_id,
-                        'content' => apply_filters( 'bp_blogs_activity_new_comment', $activity_content, &$comment, &$recorded_comment, $comment_link ), 
+                        'content' => apply_filters( 'bp_blogs_activity_new_comment', $activity_content, &$comment, &$recorded_comment, $comment_link ),
                         'primary_link' => apply_filters( 'bp_blogs_activity_new_comment_primary_link', $comment_link, &$comment, &$recorded_comment ),
                         'component_action' => 'new_blog_comment',
@@ -484 +483 @@
 function bp_blogs_approve_comment( $comment_id, $comment_status ) {
         global $bp, $wpdb;
-        
+
         if ( 'approve' != $comment_status )
                 return false;
@@ -491 +490 @@
         $comment = get_comment($comment_id);
         $comment->post = get_post( $comment->comment_post_ID );
-        
+
         bp_blogs_delete_activity( array( 'item_id' => $comment_id, 'secondary_item_id' => $recorded_comment->blog_id, 'component_name' => $bp->blogs->slug, 'component_action' => 'new_blog_comment' ) );
 
@@ -497 +496 @@
                 /* Record in activity streams */
                 $comment_link = bp_post_get_permalink( $comment->post, $recorded_comment->blog_id );
-                $activity_content = sprintf( __( '%s commented on the blog post %s', 'buddypress' ), bp_core_get_userlink( $recorded_comment->user_id ), '<a href="' . $comment_link . '#comment-' . $comment->comment_ID . '">' . $comment->post->post_title . '</a>' );                       
+                $activity_content = sprintf( __( '%s commented on the blog post %s', 'buddypress' ), bp_core_get_userlink( $recorded_comment->user_id ), '<a href="' . $comment_link . '#comment-' . $comment->comment_ID . '">' . $comment->post->post_title . '</a>' );
                 $activity_content .= '<blockquote>' . bp_create_excerpt( $comment->comment_content ) . '</blockquote>';
 
@@ -503 +502 @@
                 bp_blogs_record_activity( array(
                         'user_id' => $recorded_comment->user_id,
-                        'content' => apply_filters( 'bp_blogs_activity_new_comment', $activity_content, &$comment, &$recorded_comment, $comment_link ), 
+                        'content' => apply_filters( 'bp_blogs_activity_new_comment', $activity_content, &$comment, &$recorded_comment, $comment_link ),
                         'primary_link' => apply_filters( 'bp_blogs_activity_new_comment_primary_link', $comment_link, &$comment, &$recorded_comment ),
                         'component_action' => 'new_blog_comment',
                         'item_id' => $comment_id,
                         'secondary_item_id' => $recorded_comment->blog_id,
-                        'recorded_time' =>  $recorded_comment->date_created 
+                        'recorded_time' =>  $recorded_comment->date_created
                 ) );
         }
@@ -516 +515 @@
 function bp_blogs_unapprove_comment( $comment_id, $comment_status ) {
         if ( 'spam' == $comment_status || 'hold' == $comment_status || 'delete' == $comment_status )
-                bp_blogs_remove_comment( $comment_id );         
+                bp_blogs_remove_comment( $comment_id );
 }
 add_action( 'wp_set_comment_status', 'bp_blogs_unapprove_comment', 10, 2 );
@@ -538 +537 @@
 
         BP_Blogs_Blog::delete_blog_for_all( $blog_id );
-        
+
         // Delete activity stream item
         bp_blogs_delete_activity( array( 'item_id' => $blog_id, 'component_name' => $bp->blogs->slug, 'component_action' => 'new_blog' ) );
-        
+
         do_action( 'bp_blogs_remove_blog', $blog_id );
 }
@@ -548 +547 @@
 function bp_blogs_remove_blog_for_user( $user_id, $blog_id ) {
         global $current_user;
-        
+
         $blog_id = (int)$blog_id;
         $user_id = (int)$user_id;
@@ -565 +564 @@
 
         $post_id = (int)$post_id;
-        
+
         if ( !$blog_id )
                 $blog_id = (int)$current_blog->blog_id;
-        
+
         if ( !$existing_post )
                 $existing_post = new BP_Blogs_Post( null, $blog_id, $post_id );
@@ -574 +573 @@
         // Delete post from the bp_blogs table
         BP_Blogs_Post::delete( $post_id, $blog_id );
-                
+
         // Delete activity stream item
         bp_blogs_delete_activity( array( 'item_id' => $existing_post->id, 'component_name' => $bp->blogs->slug, 'component_action' => 'new_blog_post' ) );
@@ -586 +585 @@
 
         $recorded_comment = new BP_Blogs_Comment( false, $wpdb->blogid, $comment_id );
-        BP_Blogs_Comment::delete( $comment_id, $wpdb->blogid ); 
+        BP_Blogs_Comment::delete( $comment_id, $wpdb->blogid );
 
         // Delete activity stream item
@@ -597 +596 @@
 function bp_blogs_remove_data_for_blog( $blog_id ) {
         global $bp;
-        
+
         /* If this is regular blog, delete all data for that blog. */
         BP_Blogs_Blog::delete_blog_for_all( $blog_id );
-        BP_Blogs_Post::delete_posts_for_blog( $blog_id );               
+        BP_Blogs_Post::delete_posts_for_blog( $blog_id );
         BP_Blogs_Comment::delete_comments_for_blog( $blog_id );
 
@@ -624 +623 @@
 function bp_blogs_get_latest_posts( $blog_id = null, $limit = 5 ) {
         global $bp;
-        
+
         if ( !is_numeric( $limit ) )
                 $limit = 5;
-        
+
         return BP_Blogs_Post::get_latest_posts( $blog_id, $limit );
 }
@@ -645 +644 @@
 function bp_blogs_total_post_count( $blog_id ) {
         return BP_Blogs_Post::total_post_count( $blog_id );
-} 
+}
 
 function bp_blogs_total_comment_count( $blog_id, $post_id = false ) {
         return BP_Blogs_Post::total_comment_count( $blog_id, $post_id );
-} 
+}
 
 function bp_blogs_is_blog_hidden( $blog_id ) {
@@ -657 +656 @@
 function bp_blogs_redirect_to_random_blog() {
         global $bp, $wpdb;
-        
+
         if ( $bp->current_component == $bp->blogs->slug && isset( $_GET['random-blog'] ) ) {
                 $blog = bp_blogs_get_random_blog();
@@ -676 +675 @@
 function bp_blogs_delete_blogmeta( $blog_id, $meta_key = false, $meta_value = false ) {
         global $wpdb, $bp;
-        
+
         if ( !is_numeric( $blog_id ) )
                 return false;
-                
+
         $meta_key = preg_replace('|[^a-z0-9_]|i', '', $meta_key);
 
         if ( is_array($meta_value) || is_object($meta_value) )
                 $meta_value = serialize($meta_value);
-                
+
         $meta_value = trim( $meta_value );
 
         if ( !$meta_key ) {
-                $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->blogs->table_name_blogmeta} WHERE blog_id = %d", $blog_id ) );         
+                $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->blogs->table_name_blogmeta} WHERE blog_id = %d", $blog_id ) );
         } else if ( $meta_value ) {
                 $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->blogs->table_name_blogmeta} WHERE blog_id = %d AND meta_key = %s AND meta_value = %s", $blog_id, $meta_key, $meta_value ) );
@@ -694 +693 @@
                 $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->blogs->table_name_blogmeta} WHERE blog_id = %d AND meta_key = %s", $blog_id, $meta_key ) );
         }
-        
+
         // TODO need to look into using this.
         // wp_cache_delete($group_id, 'groups');
@@ -703 +702 @@
 function bp_blogs_get_blogmeta( $blog_id, $meta_key = '') {
         global $wpdb, $bp;
-        
+
         $blog_id = (int) $blog_id;
 
@@ -711 +710 @@
         if ( !empty($meta_key) ) {
                 $meta_key = preg_replace('|[^a-z0-9_]|i', '', $meta_key);
-                
+
                 // TODO need to look into using this.
                 //$user = wp_cache_get($user_id, 'users');
-                
+
                 // Check the cached user object
                 //if ( false !== $user && isset($user->$meta_key) )
@@ -741 +740 @@
 function bp_blogs_update_blogmeta( $blog_id, $meta_key, $meta_value ) {
         global $wpdb, $bp;
-        
+
         if ( !is_numeric( $blog_id ) )
                 return false;
-        
+
         $meta_key = preg_replace( '|[^a-z0-9_]|i', '', $meta_key );
 
         if ( is_string($meta_value) )
                 $meta_value = stripslashes($wpdb->escape($meta_value));
-                
+
         $meta_value = maybe_serialize($meta_value);
 
@@ -757 +756 @@
 
         $cur = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$bp->blogs->table_name_blogmeta} WHERE blog_id = %d AND meta_key = %s", $blog_id, $meta_key ) );
-        
+
         if ( !$cur ) {
                 $wpdb->query( $wpdb->prepare( "INSERT INTO {$bp->blogs->table_name_blogmeta} ( blog_id, meta_key, meta_value ) VALUES ( %d, %s, %s )", $blog_id, $meta_key, $meta_value ) );
@@ -775 +774 @@
         /* If this is regular blog, delete all data for that blog. */
         BP_Blogs_Blog::delete_blogs_for_user( $user_id );
-        BP_Blogs_Post::delete_posts_for_user( $user_id );               
+        BP_Blogs_Post::delete_posts_for_user( $user_id );
         BP_Blogs_Comment::delete_comments_for_user( $user_id );