Changeset 4961

Timestamp:

08/10/2011 06:32:02 AM (13 years ago)

Author:

djpaul

Message:

Tidy up whitespace. Fixes #3466, props cnorris23

Location:

trunk

Files:

• bp-activity/bp-activity-classes.php (modified) (1 diff)
• bp-activity/bp-activity-filters.php (modified) (4 diffs)
• bp-activity/bp-activity-functions.php (modified) (1 diff)
• bp-activity/bp-activity-notifications.php (modified) (3 diffs)
• bp-activity/bp-activity-screens.php (modified) (2 diffs)
• bp-blogs/bp-blogs-functions.php (modified) (4 diffs)
• bp-core/admin/bp-core-admin.php (modified) (11 diffs)
• bp-core/admin/bp-core-update.php (modified) (5 diffs)
• bp-core/bp-core-catchuri.php (modified) (5 diffs)
• bp-core/bp-core-component.php (modified) (2 diffs)
• bp-core/bp-core-cssjs.php (modified) (1 diff)
• bp-core/bp-core-filters.php (modified) (3 diffs)
• bp-core/bp-core-functions.php (modified) (6 diffs)
• bp-core/bp-core-hooks.php (modified) (1 diff)
• bp-core/bp-core-loader.php (modified) (1 diff)
• bp-core/bp-core-template.php (modified) (7 diffs)
• bp-core/css/admin.dev.css (modified) (1 diff)
• bp-core/deprecated/1.5.php (modified) (3 diffs)
• bp-forums/bp-forums-admin.php (modified) (2 diffs)
• bp-forums/bp-forums-filters.php (modified) (3 diffs)
• bp-forums/bp-forums-loader.php (modified) (1 diff)
• bp-friends/bp-friends-activity.php (modified) (3 diffs)
• bp-friends/bp-friends-functions.php (modified) (1 diff)
• bp-friends/bp-friends-notifications.php (modified) (1 diff)
• bp-friends/bp-friends-template.php (modified) (2 diffs)
• bp-groups/bp-groups-actions.php (modified) (1 diff)
• bp-groups/bp-groups-activity.php (modified) (14 diffs)
• bp-groups/bp-groups-adminbar.php (modified) (7 diffs)
• bp-groups/bp-groups-buddybar.php (modified) (1 diff)
• bp-groups/bp-groups-classes.php (modified) (13 diffs)
• bp-groups/bp-groups-filters.php (modified) (1 diff)
• bp-groups/bp-groups-forums.php (modified) (1 diff)
• bp-groups/bp-groups-functions.php (modified) (1 diff)
• bp-groups/bp-groups-loader.php (modified) (2 diffs)
• bp-groups/bp-groups-notifications.php (modified) (1 diff)
• bp-groups/bp-groups-screens.php (modified) (5 diffs)
• bp-loader.php (modified) (2 diffs)
• bp-members/bp-members-actions.php (modified) (1 diff)
• bp-members/bp-members-adminbar.php (modified) (9 diffs)
• bp-members/bp-members-buddybar.php (modified) (3 diffs)
• bp-members/bp-members-functions.php (modified) (2 diffs)
• bp-members/bp-members-notifications.php (modified) (3 diffs)
• bp-members/bp-members-signup.php (modified) (1 diff)
• bp-members/bp-members-template.php (modified) (4 diffs)
• bp-messages/bp-messages-actions.php (modified) (3 diffs)
• bp-messages/bp-messages-classes.php (modified) (3 diffs)
• bp-messages/bp-messages-functions.php (modified) (3 diffs)
• bp-messages/bp-messages-loader.php (modified) (1 diff)
• bp-messages/bp-messages-screens.php (modified) (1 diff)
• bp-themes/bp-default/_inc/css/default-rtl.css (modified) (3 diffs)
• bp-themes/bp-default/_inc/css/default.css (modified) (3 diffs)
• bp-themes/bp-default/_inc/global.js (modified) (1 diff)
• bp-themes/bp-default/activity/comment.php (modified) (1 diff)
• bp-themes/bp-default/activity/entry.php (modified) (1 diff)
• bp-themes/bp-default/groups/create.php (modified) (1 diff)
• bp-themes/bp-default/groups/single/forum/edit.php (modified) (1 diff)
• bp-themes/bp-default/groups/single/forum/topic.php (modified) (1 diff)
• bp-themes/bp-default/groups/single/home.php (modified) (1 diff)
• bp-themes/bp-default/index.php (modified) (1 diff)
• bp-themes/bp-default/members/single/activity.php (modified) (1 diff)
• bp-themes/bp-default/members/single/forums/topics.php (modified) (1 diff)
• bp-themes/bp-default/members/single/home.php (modified) (1 diff)
• bp-xprofile/bp-xprofile-actions.php (modified) (1 diff)
• bp-xprofile/bp-xprofile-activity.php (modified) (1 diff)
• bp-xprofile/bp-xprofile-classes.php (modified) (7 diffs)
• bp-xprofile/bp-xprofile-filters.php (modified) (1 diff)
• bp-xprofile/bp-xprofile-screens.php (modified) (1 diff)
• bp-xprofile/bp-xprofile-template.php (modified) (2 diffs)

trunk/bp-activity/bp-activity-classes.php

@@ -468 +468 @@
         // array of prepared integers or quoted strings
         $items_prepared = array();
-        
+
         // clean up and format each item
         foreach ( $items_dirty as $item ) {

trunk/bp-activity/bp-activity-filters.php

@@ -74 +74 @@
 add_filter( 'bp_get_activity_feed_item_description', 'bp_activity_make_nofollow_filter' );
 
-add_filter( 'pre_comment_content',                   'bp_activity_at_name_filter' ); 
-add_filter( 'group_forum_topic_text_before_save',    'bp_activity_at_name_filter' ); 
-add_filter( 'group_forum_post_text_before_save',     'bp_activity_at_name_filter' ); 
+add_filter( 'pre_comment_content',                   'bp_activity_at_name_filter' );
+add_filter( 'group_forum_topic_text_before_save',    'bp_activity_at_name_filter' );
+add_filter( 'group_forum_post_text_before_save',     'bp_activity_at_name_filter' );
 
 add_filter( 'bp_get_activity_parent_content',        'bp_create_excerpt' );
@@ -113 +113 @@
  *
  * @param string $content The activity content
- * @param int $activity_id When $adjust_mention_count is true, you must provide an $activity_id, 
+ * @param int $activity_id When $adjust_mention_count is true, you must provide an $activity_id,
  *   which will be added to the list of the user's unread mentions
  */
@@ -136 +136 @@
     }
 
-    // Adjust the activity count for this item  
+    // Adjust the activity count for this item
     if ( $activity_id )
         bp_activity_adjust_mention_count( $activity_id, 'add' );
 
     return $content;
-} 
+}
 
 /**
@@ -154 +154 @@
     // Only run this function once for a given activity item
     remove_filter( 'bp_activity_after_save', 'bp_activity_at_name_filter_updates' );
-    
+
     // Run the content through the linking filter, making sure to increment mention count
     $activity->content = bp_activity_at_name_filter( $activity->content, $activity->id );
-    
+
     // Resave the activity with the new content
     $activity->save();

trunk/bp-activity/bp-activity-functions.php

@@ -1053 +1053 @@
     $bp->activity->read_more_id = $activity->id;
 
-    add_filter( 'embed_post_id',            create_function( '', 'global $bp; return $bp->activity->read_more_id;' ) ); 
+    add_filter( 'embed_post_id',            create_function( '', 'global $bp; return $bp->activity->read_more_id;' ) );
     add_filter( 'bp_embed_get_cache',       'bp_embed_activity_cache',      10, 3 );
     add_action( 'bp_embed_update_cache',    'bp_embed_activity_save_cache', 10, 3 );

trunk/bp-activity/bp-activity-notifications.php

@@ -7 +7 @@
  *
  * @package BuddyPress Activity
- * @param str $content The content of the activity update 
+ * @param str $content The content of the activity update
  * @param int $poster_user_id The unique user_id of the user who sent the update
  * @param int $activity_id The id of the activity update
@@ -18 +18 @@
     $subject = '';
     $message = '';
-    
+
     // Add the BP notification
     bp_core_add_notification( $activity_id, $receiver_user_id, 'activity', 'new_at_mention', $activity->user_id );
-            
+
     // Now email the user with the contents of the message (if they have enabled email notifications)
     if ( 'no' != bp_get_user_meta( $receiver_user_id, 'notification_activity_new_mention', true ) ) {
@@ -69 +69 @@
         wp_mail( $to, $subject, $message );
     }
-    
+
     do_action( 'bp_activity_sent_mention_email', $activity, $subject, $message, $content );
 }

trunk/bp-activity/bp-activity-screens.php

@@ -79 +79 @@
  * @uses bp_is_my_profile()
  */
-function bp_activity_reset_my_new_mentions() {  
+function bp_activity_reset_my_new_mentions() {
     if ( bp_is_my_profile() )
         bp_activity_clear_new_mentions( bp_loggedin_user_id() );
@@ -91 +91 @@
     if ( !bp_is_activity_component() )
         return false;
-    
-    if ( empty( $bp->current_action ) || !is_numeric( $bp->current_action ) ) 
-        return false; 
-    
+
+    if ( empty( $bp->current_action ) || !is_numeric( $bp->current_action ) )
+        return false;
+
     // Get the activity details
     $activity = bp_activity_get_specific( array( 'activity_ids' => bp_current_action(), 'show_hidden' => true ) );

trunk/bp-blogs/bp-blogs-functions.php

@@ -35 +35 @@
 
 /**
- * Populates the BP blogs table with existing blogs. 
+ * Populates the BP blogs table with existing blogs.
  *
  * @package BuddyPress Blogs
@@ -56 +56 @@
             $users      = get_users( array( 'blog_id' => $blog_id ) );
             $subscribers    = get_users( array( 'blog_id' => $blog_id, 'role' => 'subscriber' ) );
-            
+
             if ( $users ) {
                 foreach ( (array)$users as $user ) {
@@ -103 +103 @@
 
     $is_private = !empty( $_POST['blog_public'] ) && (int)$_POST['blog_public'] ? false : true;
-    $is_private = !apply_filters( 'bp_is_new_blog_public', !$is_private ); 
+    $is_private = !apply_filters( 'bp_is_new_blog_public', !$is_private );
 
     // Only record this activity if the blog is public
@@ -166 +166 @@
         return false;
 
-    $is_blog_public = apply_filters( 'bp_is_blog_public', (int)get_blog_option( $blog_id, 'blog_public' ) ); 
+    $is_blog_public = apply_filters( 'bp_is_blog_public', (int)get_blog_option( $blog_id, 'blog_public' ) );
 
     if ( 'publish' == $post->post_status && empty( $post->post_password ) ) {

trunk/bp-core/admin/bp-core-admin.php

@@ -19 +19 @@
  * @since {@internal Unknown}}
  */
-function bp_core_admin_dashboard() { 
+function bp_core_admin_dashboard() {
     $base_url = bp_get_admin_url( 'admin.php' );
     $action   = add_query_arg( array( 'page' => 'bp-general-settings' ), $base_url );
@@ -331 +331 @@
 function bp_core_admin_component_options() {
     global $bp_wizard;
-    
+
     // Load core functions, if needed
     if ( !function_exists( 'bp_get_option' ) )
@@ -337 +337 @@
 
     $active_components = apply_filters( 'bp_active_components', bp_get_option( 'bp-active-components' ) );
-    
+
     // An array of strings looped over to create component setup markup
     $optional_components = apply_filters( 'bp_admin_optional_components', array(
@@ -388 +388 @@
         ),
     ) );
-    
+
     // On new install, set all components to be active by default
     if ( !empty( $bp_wizard ) && 'install' == $bp_wizard->setup_type && empty( $active_components ) )
@@ -394 +394 @@
 
     ?>
-    
+
     <?php /* The setup wizard uses different, more descriptive text here */ ?>
     <?php if ( empty( $bp_wizard ) ) : ?>
 
         <h3><?php _e( 'Available Components', 'buddypress' ); ?></h3>
-                
+
         <p><?php _e( 'Each component has a unique purpose, and your community may not need each one.', 'buddypress' ); ?></p>
 
     <?php endif ?>
-    
+
     <table class="form-table">
         <tbody>
@@ -480 +480 @@
 function bp_core_admin_page_options() {
     global $bp;
-    
+
     // Get the existing WP pages
     $existing_pages = bp_core_get_directory_page_ids();
@@ -492 +492 @@
         // Only components that need directories should be listed here
         if ( isset( $bp->{$component_id} ) && !empty( $bp->{$component_id}->has_directory ) ) {
-            
+
             // component->name was introduced in BP 1.5, so we must provide a fallback
             $component_name = !empty( $bp->{$component_id}->name ) ? $bp->{$component_id}->name : ucwords( $component_id );
-            
+
             $directory_pages[$component_id] = $component_name;
         }
     }
-    
+
     $directory_pages = apply_filters( 'bp_directory_pages', $directory_pages );
-    
+
     ?>
-    
+
     <h3><?php _e( 'Directories', 'buddypress' ); ?></h3>
-    
+
     <p><?php _e( 'Associate a WordPress Page with each BuddyPress component directory.', 'buddypress' ); ?></p>
 
@@ -513 +513 @@
             <?php foreach ( $directory_pages as $name => $label ) : ?>
                 <?php $disabled = !bp_is_active( $name ) ? ' disabled="disabled"' : ''; ?>
-                
+
                 <tr valign="top">
                     <th scope="row">
@@ -520 +520 @@
 
                     <td>
-                        <?php if ( !bp_is_root_blog() ) 
+                        <?php if ( !bp_is_root_blog() )
                             switch_to_blog( bp_get_root_blog_id() ) ?>
-                        
+
                         <?php echo wp_dropdown_pages( array(
                             'name'             => 'bp_pages[' . esc_attr( $name ) . ']',
@@ -538 +538 @@
 
                         <?php endif; ?>
-                        
-                        <?php if ( !bp_is_root_blog() ) 
+
+                        <?php if ( !bp_is_root_blog() )
                             restore_current_blog() ?>
 
@@ -552 +552 @@
         </tbody>
     </table>
-    
+
     <?php
 

trunk/bp-core/admin/bp-core-update.php

@@ -263 +263 @@
     }
 
-    function step_ms_update() {     
+    function step_ms_update() {
         if ( !current_user_can( 'activate_plugins' ) )
             return false;
@@ -371 +371 @@
 
         $existing_pages = bp_core_update_get_page_meta();
-        
+
         // Provide empty indexes to avoid PHP errors with wp_dropdown_pages()
         $indexes = array( 'members', 'activity', 'groups', 'forums', 'blogs', 'register', 'activate' );
@@ -378 +378 @@
                 $existing_pages[$index] = '';
         }
-        
+
         if ( !empty( $existing_pages['blogs'] ) )
             $existing_blog_page = '&selected=' . $existing_pages['blogs'];
@@ -1272 +1272 @@
 function bp_core_update_do_network_admin() {
     $do_network_admin = false;
-    
+
     if ( is_multisite() && ( !defined( 'BP_ENABLE_MULTIBLOG' ) || !BP_ENABLE_MULTIBLOG ) )
         $do_network_admin = true;
-    
+
     return apply_filters( 'bp_core_do_network_admin', $do_network_admin );
 }
@@ -1281 +1281 @@
 function bp_core_update_admin_hook() {
     $hook = bp_core_update_do_network_admin() ? 'network_admin_menu' : 'admin_menu';
-    
+
     return apply_filters( 'bp_core_admin_hook', $hook );
 }

trunk/bp-core/bp-core-catchuri.php

@@ -181 +181 @@
         }
     }
-    
-    // URLs with BP_ENABLE_ROOT_PROFILES enabled won't be caught above 
+
+    // URLs with BP_ENABLE_ROOT_PROFILES enabled won't be caught above
     if ( empty( $matches ) && defined( 'BP_ENABLE_ROOT_PROFILES' ) && BP_ENABLE_ROOT_PROFILES ) {
-        
+
         // Make sure there's a user corresponding to $bp_uri[0]
         if ( !empty( $bp_uri[0] ) && $root_profile = get_userdatabylogin( $bp_uri[0] ) ) {
-            
+
             // Force BP to recognize that this is a members page
             $matches[]  = 1;
             $match      = $bp->pages->members;
             $match->key = 'members';
-            
+
             // Without the 'members' URL chunk, WordPress won't know which page to load
             // This filter intercepts the WP query and tells it to load the members page
             add_filter( 'request', create_function( '$query_args', '$query_args["pagename"] = "' . $match->name . '"; return $query_args;' ) );
-        
-        }
-    
+
+        }
+
     }
 
@@ -224 +224 @@
 
     // Global the unfiltered offset to use in bp_core_load_template().
-    // To avoid PHP warnings in bp_core_load_template(), it must always be >= 0 
+    // To avoid PHP warnings in bp_core_load_template(), it must always be >= 0
     $bp_unfiltered_uri_offset = $uri_offset >= 0 ? $uri_offset : 0;
 
@@ -238 +238 @@
             // Viewing a specific user
             if ( !empty( $bp_uri[$uri_offset + 1] ) ) {
-                
+
                 // Switch the displayed_user based on compatbility mode
                 if ( bp_is_username_compatibility_mode() )
@@ -247 +247 @@
                 if ( empty( $bp->displayed_user->id ) ) {
                     // Prevent components from loading their templates
-                    $bp->current_component = ''; 
+                    $bp->current_component = '';
 
                     bp_do_404();
@@ -263 +263 @@
                     $bp->current_component = '';
                 }
-                
+
                 // Reset the offset
                 $uri_offset = 0;

trunk/bp-core/bp-core-component.php

@@ -34 +34 @@
      */
     var $slug;
-    
-    /**
-     * @var bool Does this component need a top-level directory? 
+
+    /**
+     * @var bool Does this component need a top-level directory?
      */
     var $has_directory;
@@ -139 +139 @@
             foreach ( $r['global_tables'] as $global_name => $table_name )
                 $this->$global_name = $table_name;
-        
+
         /** BuddyPress ********************************************************/
 

trunk/bp-core/bp-core-cssjs.php

@@ -78 +78 @@
     $image = apply_filters( 'bp_inline_cropper_image', getimagesize( bp_core_avatar_upload_path() . $bp->avatar_admin->image->dir ) );
     $aspect_ratio = 1;
-    
+
     $full_height = bp_core_avatar_full_height();
     $full_width  = bp_core_avatar_full_width();
-    
+
     // Calculate Aspect Ratio
     if ( $full_height && ( $full_width != $full_height ) )

trunk/bp-core/bp-core-filters.php

@@ -77 +77 @@
         $themes['bp-default'] = 1;
     }
-    
+
     return $themes;
 }
@@ -279 +279 @@
     if ( !empty( $bp->displayed_user->fullname ) && !is_404() ) {
         // translators: "displayed user's name | canonicalised component name"
-        $title = strip_tags( sprintf( __( '%1$s | %2$s', 'buddypress' ), bp_get_displayed_user_fullname(), ucwords( bp_current_component() ) ) ); 
+        $title = strip_tags( sprintf( __( '%1$s | %2$s', 'buddypress' ), bp_get_displayed_user_fullname(), ucwords( bp_current_component() ) ) );
 
     // A single group
@@ -314 +314 @@
     } elseif ( bp_is_create_blog() ) {
         $title = __( 'Create a Site', 'buddypress' );
-    }   
+    }
 
     // Some BP nav items contain item counts. Remove them

trunk/bp-core/bp-core-functions.php

@@ -130 +130 @@
 function bp_core_get_directory_pages() {
     global $wpdb, $bp;
-    
+
     // Set pages as standard class
     $pages = new stdClass;
@@ -979 +979 @@
 function bp_core_get_root_options() {
     global $wpdb;
-    
+
     // These options come from the root blog options table
     $root_blog_options = apply_filters( 'bp_core_site_options', array(
-    
+
     // BuddyPress core settings
     'bp-deactivated-components'       => serialize( array( ) ),
@@ -995 +995 @@
     'bb-config-location'              => ABSPATH,
     'hide-loggedout-adminbar'         => '0',
-    
+
     // Useful WordPress settings
     'registration'                    => '0',
     'avatar_default'                  => 'mysteryman'
     ) );
-    
+
     $root_blog_option_keys  = array_keys( $root_blog_options );
     $blog_options_keys      = implode( "', '", (array) $root_blog_option_keys );
     $blog_options_query     = sprintf( "SELECT option_name AS name, option_value AS value FROM {$wpdb->options} WHERE option_name IN ('%s')", $blog_options_keys );
     $root_blog_options_meta = $wpdb->get_results( $blog_options_query );
-    
+
     // On Multisite installations, some options must always be fetched from sitemeta
     if ( is_multisite() ) {
@@ -1013 +1013 @@
             'fileupload_maxk' => '1500'
         ) );
-        
+
         $network_option_keys    = array_keys( $network_options );
         $sitemeta_options_keys  = implode( "','", (array) $network_option_keys );
         $sitemeta_options_query = sprintf( "SELECT meta_key AS name, meta_value AS value FROM {$wpdb->sitemeta} WHERE meta_key IN ('%s')", $sitemeta_options_keys );
         $network_options_meta   = $wpdb->get_results( $sitemeta_options_query );
-        
+
         // Sitemeta comes second in the merge, so that network 'registration' value wins
         $root_blog_options_meta = array_merge( $root_blog_options_meta, $network_options_meta );
     }
-    
+
     // Missing some options, so do some one-time fixing
     if ( empty( $root_blog_options_meta ) || ( count( $root_blog_options_meta ) < count( $root_blog_option_keys ) ) ) {
-    
+
     // Unset the query - We'll be resetting it soon
     unset( $root_blog_options_meta );
-    
+
     // Loop through options
     foreach ( $root_blog_options as $old_meta_key => $old_meta_default ) {
         // Clear out the value from the last time around
         unset( $old_meta_value );
-        
+
         // Get old site option
         if ( is_multisite() )
             $old_meta_value = get_site_option( $old_meta_key );
-        
+
         // No site option so look in root blog
         if ( empty( $old_meta_value ) )
             $old_meta_value = bp_get_option( $old_meta_key, $old_meta_default );
-        
+
         // Update the root blog option
         bp_update_option( $old_meta_key, $old_meta_value );
-        
+
         // Update the global array
         $root_blog_options_meta[$old_meta_key] = $old_meta_value;
     }
-    
+
     // We're all matched up
     } else {
@@ -1054 +1054 @@
         foreach ( $root_blog_options_meta as $root_blog_option )
             $root_blog_options[$root_blog_option->name] = $root_blog_option->value;
-        
+
         // Copy the options no the return val
         $root_blog_options_meta = $root_blog_options;
-        
+
         // Clean up our temporary copy
         unset( $root_blog_options );
     }
-    
+
     return apply_filters( 'bp_core_get_root_options', $root_blog_options_meta );
 }
@@ -1091 +1091 @@
         $bp->add_root[] = $slug;
     }
-    
+
     // Make sure that this component is registered as requiring a top-level directory
     if ( isset( $bp->{$slug} ) ) {

trunk/bp-core/bp-core-hooks.php

@@ -35 +35 @@
 // Setup widgets
 add_action( 'bp_loaded',  'bp_setup_widgets'           );
-    
+
 // Setup admin bar
 add_action( 'bp_loaded',  'bp_core_load_admin_bar'     );

trunk/bp-core/bp-core-loader.php

@@ -25 +25 @@
 
 // Move active components from sitemeta, if necessary
-// Provides backpat with earlier versions of BP 
+// Provides backpat with earlier versions of BP
 if ( is_multisite() && $active_components = get_site_option( 'bp-active-components' ) )
     bp_update_option( 'bp-active-components', $active_components );

trunk/bp-core/bp-core-template.php

@@ -495 +495 @@
 function bp_action_variable( $position = 0 ) {
     $action_variables = bp_action_variables();
-    
+
     $action_variable = isset( $action_variables[$position] ) ? $action_variables[$position] : false;
-    
+
     return apply_filters( 'bp_action_variable', $action_variable, $position );
 }
@@ -669 +669 @@
         } elseif ( isset( $bp->{$component}->slug ) && $bp->{$component}->slug == $bp->current_component ) {
             $is_current_component = true;
-            
+
         // Next, check to see whether $component is a canonical,
         // non-translatable component name. If so, we can return its
@@ -677 +677 @@
                 $is_current_component = true;
 
-        // If we haven't found a match yet, check against the root_slugs 
+        // If we haven't found a match yet, check against the root_slugs
         // created by $bp->pages, as well as the regular slugs
         } else {
@@ -752 +752 @@
  *   the function will return true if the $action_variable is found *anywhere* in the action
  *   variables array.
- * @return bool 
+ * @return bool
  */
 function bp_is_action_variable( $action_variable = '', $position = false ) {
     $is_action_variable = false;
-    
+
     if ( false !== $position ) {
-        // When a $position is specified, check that slot in the action_variables array     
+        // When a $position is specified, check that slot in the action_variables array
         if ( $action_variable ) {
             $is_action_variable = $action_variable == bp_action_variable( $position );
@@ -770 +770 @@
         $is_action_variable = in_array( $action_variable, (array)bp_action_variables() );
     }
-    
+
     return apply_filters( 'bp_is_action_variable', $is_action_variable, $action_variable, $position );
 }
@@ -829 +829 @@
 function bp_is_root_component( $component_name ) {
     global $bp;
-    
+
     if ( !isset( $bp->active_components ) )
         return false;
@@ -1030 +1030 @@
     if ( bp_is_current_component( 'xprofile' ) && bp_is_current_action( 'edit' ) )
         return true;
-        
+
     return false;
 }

trunk/bp-core/css/admin.dev.css

@@ -92 +92 @@
         top: 5px;
     }
-    
+
 div#bp-admin div.prev-next, div#bp-admin div.prev-next p,
 div#bp-admin div.submit, div#bp-admin div.submit p {

trunk/bp-core/deprecated/1.5.php

@@ -218 +218 @@
  */
 function bp_page_title() {
-    echo bp_get_page_title(); 
+    echo bp_get_page_title();
 }
     /**
@@ -260 +260 @@
 function groups_at_message_notification( $content, $poster_user_id, $group_id, $activity_id ) {
     global $bp;
-    
+
     _deprecated_function( __FUNCTION__, '1.5', 'bp_activity_at_message_notification()' );
 
@@ -337 +337 @@
  * In BP 1.5, these functions were renamed for greater consistency
  */
-function bp_forum_directory_permalink() { 
+function bp_forum_directory_permalink() {
     _deprecated_function( __FUNCTION__, '1.5', 'bp_forums_directory_permalink()' );
     bp_forums_directory_permalink();
-} 
-    function bp_get_forum_directory_permalink() { 
+}
+    function bp_get_forum_directory_permalink() {
         _deprecated_function( __FUNCTION__, '1.5', 'bp_get_forums_directory_permalink()' );
         return bp_get_forums_directory_permalink();
     }
-    
+
 /** Theme *********************************************************************/
 

trunk/bp-forums/bp-forums-admin.php

@@ -16 +16 @@
 
 function bp_forums_bbpress_admin() {
-    global $bp; 
-    
+    global $bp;
+
     $action = bp_get_admin_url( 'admin.php?page=bb-forums-setup&reinstall=1' );
     ?>
@@ -100 +100 @@
                         // Just write the contents to screen
                         _e( '<p>A configuration file could not be created. No problem, but you will need to save the text shown below into a file named <code>bb-config.php</code> in the root directory of your WordPress installation before you can start using the forum functionality.</p>', 'buddypress' ); ?>
-                    
+
                         <textarea style="display:block; margin-top: 30px; width: 80%;" rows="50"><?php echo htmlspecialchars( $result ); ?></textarea>
 

trunk/bp-forums/bp-forums-filters.php

@@ -157 +157 @@
 function bp_forums_add_replied_distinct_sql( $sql ) {
     global $wpdb;
-    
+
     $sql = $wpdb->prepare( "DISTINCT t.topic_id, " );
-    
+
     return $sql;
 }
@@ -178 +178 @@
 function bp_forums_add_replied_join_sql( $sql ) {
     global $bbdb, $wpdb;
-    
+
     $sql .= $wpdb->prepare( " LEFT JOIN $bbdb->posts p ON p.topic_id = t.topic_id " );
-    
+
     return $sql;
 }
@@ -198 +198 @@
 function bp_forums_add_replied_where_sql( $sql ) {
     global $wpdb;
-    
+
     $sql .= $wpdb->prepare( " AND p.poster_id = %s ", bp_displayed_user_id() );
 

trunk/bp-forums/bp-forums-loader.php

@@ -106 +106 @@
         if ( !is_user_logged_in() && !isset( $bp->displayed_user->id ) )
             return;
-        
+
         // Add 'Forums' to the main navigation
         $main_nav = array(

trunk/bp-friends/bp-friends-activity.php

@@ -71 +71 @@
         case 'friendship_accepted':
             $link = bp_loggedin_user_domain() . bp_get_friends_slug() . '/my-friends/newest';
-            
+
             // Set up the string and the filter
             if ( (int)$total_items > 1 ) {
@@ -80 +80 @@
                 $filter = 'bp_friends_single_friendship_accepted_notification';
             }
-            
+
             break;
 
         case 'friendship_request':
             $link = bp_loggedin_user_domain() . bp_get_friends_slug() . '/requests?new';
-            
+
             // Set up the string and the filter
             if ( (int)$total_items > 1 ) {
@@ -94 +94 @@
                 $filter = 'bp_friends_single_friendship_request_notification';
             }
-        
+
             break;
     }
-        
+
     // Return either an HTML link or an array, depending on the requested format
     if ( 'string' == $format ) {

trunk/bp-friends/bp-friends-functions.php

@@ -257 +257 @@
 function friends_update_friend_totals( $initiator_user_id, $friend_user_id, $status = 'add' ) {
     global $bp;
-    
+
     if ( 'add' == $status ) {
         bp_update_user_meta( $initiator_user_id, 'total_friend_count', (int)bp_get_user_meta( $initiator_user_id, 'total_friend_count', true ) + 1 );

trunk/bp-friends/bp-friends-notifications.php

@@ -35 +35 @@
 
     $message .= sprintf( __( 'To disable these notifications please log in and go to: %s', 'buddypress' ), $settings_link );
-    
+
     /* Send the message */
     $to = apply_filters( 'friends_notification_new_request_to', $to );

trunk/bp-friends/bp-friends-template.php

@@ -76 +76 @@
 function bp_friends_filter_title() {
     $current_filter = bp_action_variable( 0 );
-    
+
     switch ( $current_filter ) {
         case 'recently-active': default:
@@ -144 +144 @@
         wp_cache_set( 'friends_random_users', $user_ids, 'bp' );
     }
-    
+
     ?>
 

trunk/bp-groups/bp-groups-actions.php

@@ -103 +103 @@
                 bp_core_redirect( bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/create/step/' . $bp->groups->current_create_step . '/' );
             }
-            
-            // Set the invite status            
+
+            // Set the invite status
             // Checked against a whitelist for security
             $allowed_invite_status = apply_filters( 'groups_allowed_invite_status', array( 'members', 'mods', 'admins' ) );
             $invite_status         = in_array( $_POST['group-invite-status'], (array)$allowed_invite_status ) ? $_POST['group-invite-status'] : 'members';
-            
+
             groups_update_groupmeta( $bp->groups->new_group_id, 'invite_status', $invite_status );
         }

trunk/bp-groups/bp-groups-activity.php

@@ -94 +94 @@
                 $filter = 'bp_groups_multiple_new_membership_requests_notification';
                 $notification_link = $group_link . 'admin/membership-requests/?n=1';
-                
+
                 if ( 'string' == $format ) {
                     return apply_filters( $filter, '<a href="' . $notification_link . '" title="' . __( 'Group Membership Requests', 'buddypress' ) . '">' . $text . '</a>', $group_link, $total_items, $group->name, $text, $notification_link );
@@ -108 +108 @@
                 $filter = 'bp_groups_single_new_membership_request_notification';
                 $notification_link = $group_link . 'admin/membership-requests/?n=1';
-                
+
                 if ( 'string' == $format ) {
                     return apply_filters( $filter, '<a href="' . $notification_link . '" title="' . sprintf( __( '%s requests group membership', 'buddypress' ), $user_fullname ) . '">' . $text . '</a>', $group_link, $user_fullname, $group->name, $text, $notification_link );
@@ -118 +118 @@
                 }
             }
-            
+
             break;
 
@@ -129 +129 @@
             if ( (int)$total_items > 1 ) {
                 $text = sprintf( __( '%d accepted group membership requests', 'buddypress' ), (int)$total_items, $group->name );
-                $filter = 'bp_groups_multiple_membership_request_accepted_notification';                
+                $filter = 'bp_groups_multiple_membership_request_accepted_notification';
                 $notification_link = bp_loggedin_user_domain() . bp_get_groups_slug() . '/?n=1';
-                
+
                 if ( 'string' == $format ) {
                     return apply_filters( $filter, '<a href="' . $notification_link . '" title="' . __( 'Groups', 'buddypress' ) . '">' . $text . '</a>', $total_items, $group->name, $text, $notification_link );
@@ -144 +144 @@
                 $filter = 'bp_groups_single_membership_request_accepted_notification';
                 $notification_link = $group_link . '?n=1';
-                
+
                 if ( 'string' == $format ) {
                     return apply_filters( $filter, '<a href="' . $notification_link . '">' . $text . '</a>', $group_link, $group->name, $text, $notification_link );
@@ -162 +162 @@
             $group = new BP_Groups_Group( $group_id );
             $group_link = bp_get_group_permalink( $group );
-            
+
             if ( (int)$total_items > 1 ) {
                 $text = sprintf( __( '%d rejected group membership requests', 'buddypress' ), (int)$total_items, $group->name );
                 $filter = 'bp_groups_multiple_membership_request_rejected_notification';
                 $notification_link = bp_loggedin_user_domain() . bp_get_groups_slug() . '/?n=1';
-                
+
                 if ( 'string' == $format ) {
                     return apply_filters( $filter, '<a href="' . $notification_link . '" title="' . __( 'Groups', 'buddypress' ) . '">' . $text . '</a>', $total_items, $group->name );
@@ -180 +180 @@
                 $filter = 'bp_groups_single_membership_request_rejected_notification';
                 $notification_link = $group_link . '?n=1';
-                
+
                 if ( 'string' == $format ) {
                     return apply_filters( $filter, '<a href="' . $notification_link . '">' . $text . '</a>', $group_link, $group->name, $text, $notification_link );
@@ -203 +203 @@
                 $filter = 'bp_groups_multiple_member_promoted_to_admin_notification';
                 $notification_link = bp_loggedin_user_domain() . bp_get_groups_slug() . '?n=1';
-                
+
                 if ( 'string' == $format ) {
                     return apply_filters( $filter, '<a href="' . $notification_link . '" title="' . __( 'Groups', 'buddypress' ) . '">' . $text . '</a>', $total_items, $text, $notification_link );
@@ -216 +216 @@
                 $filter = 'bp_groups_single_member_promoted_to_admin_notification';
                 $notification_link = $group_link . '?n=1';
-                
+
                 if ( 'string' == $format ) {
                     return apply_filters( $filter, '<a href="' . $notification_link . '">' . $text . '</a>', $group_link, $group->name, $text, $notification_link );
@@ -239 +239 @@
                 $filter = 'bp_groups_multiple_member_promoted_to_mod_notification';
                 $notification_link = bp_loggedin_user_domain() . bp_get_groups_slug() . '?n=1';
-                
+
                 if ( 'string' == $format ) {
                     return apply_filters( $filter, '<a href="' . $notification_link . '" title="' . __( 'Groups', 'buddypress' ) . '">' . $text . '</a>', $total_items, $text, $notification_link );
@@ -252 +252 @@
                 $filter = 'bp_groups_single_member_promoted_to_mod_notification';
                 $notification_link = $group_link . '?n=1';
-                
+
                 if ( 'string' == $format ) {
                     return apply_filters( $filter, '<a href="' . $notification_link . '">' . $text . '</a>', $group_link, $group->name, $text, $notification_link );
@@ -267 +267 @@
         case 'group_invite':
             $group_id = $item_id;
-            $group = new BP_Groups_Group( $group_id );  
-            $group_link = bp_get_group_permalink( $group );
-            
+            $group = new BP_Groups_Group( $group_id );
+            $group_link = bp_get_group_permalink( $group );
+
             $notification_link = bp_loggedin_user_domain() . bp_get_groups_slug() . '/invites/?n=1';
 
@@ -275 +275 @@
                 $text = sprintf( __( 'You have %d new group invitations', 'buddypress' ), (int)$total_items );
                 $filter = 'bp_groups_multiple_group_invite_notification';
-                
+
                 if ( 'string' == $format ) {
                     return apply_filters( $filter, '<a href="' . $notification_link . '" title="' . __( 'Group Invites', 'buddypress' ) . '">' . $text . '</a>', $total_items, $text, $notification_link );
@@ -287 +287 @@
                 $text = sprintf( __( 'You have an invitation to the group: %s', 'buddypress' ), $group->name );
                 $filter = 'bp_groups_single_group_invite_notification';
-                
+
                 if ( 'string' == $format ) {
                     return apply_filters( $filter, '<a href="' . $notification_link . '">' . $text . '</a>', $group_link, $group->name, $text, $notification_link );

trunk/bp-groups/bp-groups-adminbar.php

@@ -50 +50 @@
         'href'  => bp_get_group_permalink( $bp->groups->current_group )
     ) );
-    
+
     // Group Admin > Edit details
     $wp_admin_bar->add_menu( array(
@@ -58 +58 @@
         'href'   =>  bp_get_groups_action_link( 'admin/edit-details' )
     ) );
-    
+
     // Group Admin > Group settings
     $wp_admin_bar->add_menu( array(
@@ -66 +66 @@
         'href'   =>  bp_get_groups_action_link( 'admin/group-settings' )
     ) );
-    
+
     // Group Admin > Group avatar
     $wp_admin_bar->add_menu( array(
@@ -74 +74 @@
         'href'   =>  bp_get_groups_action_link( 'admin/group-avatar' )
     ) );
-    
+
     // Group Admin > Manage invitations
     if ( bp_is_active( 'friends' ) ) {
@@ -84 +84 @@
         ) );
     }
-    
+
     // Group Admin > Manage members
     $wp_admin_bar->add_menu( array(
@@ -92 +92 @@
         'href'   =>  bp_get_groups_action_link( 'admin/manage-members' )
     ) );
-    
+
     // Group Admin > Membership Requests
     if ( bp_get_group_status( $bp->groups->current_group ) == 'private' ) {
@@ -101 +101 @@
             'href'   =>  bp_get_groups_action_link( 'admin/membership-requests' )
         ) );
-    }   
-    
+    }
+
     // Delete Group
     $wp_admin_bar->add_menu( array(

trunk/bp-groups/bp-groups-buddybar.php

@@ -18 +18 @@
         <ul>
             <li><a href="<?php bp_groups_action_link( 'admin/edit-details' ); ?>"><?php _e( 'Edit Details', 'buddypress' ); ?></a></li>
-            
+
             <li><a href="<?php bp_groups_action_link( 'admin/group-settings' );  ?>"><?php _e( 'Group Settings', 'buddypress' ); ?></a></li>
-            
+
             <li><a href="<?php bp_groups_action_link( 'admin/group-avatar' ); ?>"><?php _e( 'Group Avatar', 'buddypress' ); ?></a></li>
 

trunk/bp-groups/bp-groups-classes.php

@@ -294 +294 @@
             if ( is_array( $include ) )
                 $include = implode( ',', $include );
-                
+
             $include = $wpdb->escape( $include );
             $sql['include'] = " AND g.id IN ({$include})";
@@ -302 +302 @@
             if ( is_array( $exclude ) )
                 $exclude = implode( ',', $exclude );
-                
+
             $exclude = $wpdb->escape( $exclude );
             $sql['exclude'] = " AND g.id NOT IN ({$exclude})";
@@ -598 +598 @@
         return $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(id) FROM {$bp->groups->table_name_members} WHERE group_id = %d AND is_confirmed = 1 AND is_banned = 0", $group_id ) );
     }
-    
-    
+
+
     /**
      * Get a total count of all topics of a given status, across groups/forums
@@ -611 +611 @@
     function get_global_topic_count( $status = 'public', $search_terms = false ) {
         global $bbdb, $wpdb, $bp;
-        
+
         switch ( $status ) {
             case 'all' :
                 $status_sql = '';
                 break;
-                
+
             case 'hidden' :
                 $status_sql = $wpdb->prepare( "AND g.status = 'hidden'" );
                 break;
-                
+
             case 'private' :
                 $status_sql = $wpdb->prepare( "AND g.status = 'private'" );
                 break;
-                
+
             case 'public' :
             default :
@@ -630 +630 @@
                 break;
         }
-        
+
         $sql = array();
-        
+
         $sql['select'] = "SELECT COUNT(t.topic_id)";
-        
+
         $sql['from'] = "FROM {$bbdb->topics} AS t INNER JOIN {$bp->groups->table_name_groupmeta} AS gm ON t.forum_id = gm.meta_value INNER JOIN {$bp->groups->table_name} AS g ON gm.group_id = g.id";
-        
+
         $sql['where'] = "WHERE gm.meta_key = 'forum_id' {$status_sql} AND t.topic_status = '0' AND t.topic_sticky != '2'";
-        
+
         if ( $search_terms ) {
             $st = like_escape( $search_terms );
             $sql['where'] .= " AND (  t.topic_title LIKE '%{$st}%' )";
         }
-        
+
         return $wpdb->get_var( implode( ' ', $sql ) );
     }
@@ -667 +667 @@
         $this->__construct($user_id,$group_id,$id,$populate);
     }
-    
+
     function __construct( $user_id = 0, $group_id = 0, $id = false, $populate = true ) {
         if ( $user_id && $group_id && !$id ) {
@@ -772 +772 @@
     function ban() {
         global $bp;
-        
+
         if ( $this->is_admin )
             return false;
@@ -790 +790 @@
     function unban() {
         global $bp;
-        
+
         if ( $this->is_admin )
             return false;
@@ -804 +804 @@
     function accept_invite() {
         global $bp;
-        
+
         $this->inviter_id    = 0;
         $this->is_confirmed  = 1;
@@ -814 +814 @@
     function accept_request() {
         global $bp;
-        
+
         $this->is_confirmed = 1;
         $this->date_modified = bp_core_current_time();
@@ -958 +958 @@
         if ( !$user_id )
             return false;
-        
+
         $sql = "SELECT id FROM {$bp->groups->table_name_members} WHERE user_id = %d AND group_id = %d AND is_confirmed = 0 AND inviter_id != 0";
-        
+
         if ( 'sent' == $type )
             $sql .= " AND invite_sent = 1";
@@ -1215 +1215 @@
     function _register() {
         global $bp;
-        
+
         if ( !empty( $this->enable_create_step ) ) {
             // Insert the group creation step for the new group extension
@@ -1245 +1245 @@
                 add_action( $this->display_hook, array( &$this, 'widget_display' ) );
         }
-        
+
         // Construct the admin edit tab for the new group extension
         if ( !empty( $this->enable_edit_item ) && !empty( $bp->is_item_admin ) ) {

trunk/bp-groups/bp-groups-filters.php

@@ -80 +80 @@
 function groups_add_forum_tables_sql( $sql = '' ) {
     global $bp;
-    
+
     $sql .= 'JOIN ' . $bp->groups->table_name . ' AS g LEFT JOIN ' . $bp->groups->table_name_groupmeta . ' AS gm ON g.id = gm.group_id ';
-    
+
     return $sql;
 }

trunk/bp-groups/bp-groups-forums.php

@@ -214 +214 @@
             // The activity item for the initial topic
             bp_activity_delete( array( 'item_id' => $bp->groups->current_group->id, 'secondary_item_id' => $topic_id, 'component' => $bp->groups->id, 'type' => 'new_forum_topic' ) );
-            
+
             // The activity item for each post
             foreach ( (array)$posts as $post ) {

trunk/bp-groups/bp-groups-functions.php

@@ -427 +427 @@
 function groups_get_current_group() {
     global $bp;
-    
+
     $current_group = isset( $bp->groups->current_group ) ? $bp->groups->current_group : false;
-    
+
     return apply_filters( 'groups_get_current_group', $current_group );
 }

trunk/bp-groups/bp-groups-loader.php

@@ -94 +94 @@
 
             $bp->is_single_item  = true;
-            $current_group_class = apply_filters( 'bp_groups_current_group_class', 'BP_Groups_Group' ); 
+            $current_group_class = apply_filters( 'bp_groups_current_group_class', 'BP_Groups_Group' );
             $this->current_group = apply_filters( 'bp_groups_current_group_object', new $current_group_class( $group_id ) );
 
@@ -163 +163 @@
             return;
         }
-        
+
         // Group access control
         if ( bp_is_groups_component() && !empty( $this->current_group ) && !empty( $bp->current_action ) && !$this->current_group->user_has_access ) {
             if ( is_user_logged_in() ) {
                 // Off-limits to this user. Throw an error and redirect to the
-                // group's home page            
+                // group's home page
                 bp_core_no_access( array(
                     'message'  => __( 'You do not have access to this group.', 'buddypress' ),

trunk/bp-groups/bp-groups-notifications.php

@@ -247 +247 @@
 
         wp_mail( $to, $subject, $message );
-                
+
         do_action( 'bp_groups_sent_invited_email', $invited_user_id, $subject, $message, $group );
     }

trunk/bp-groups/bp-groups-screens.php

@@ -509 +509 @@
         if ( isset( $_POST['save'] ) ) {
             $enable_forum   = ( isset($_POST['group-show-forum'] ) ) ? 1 : 0;
-            
+
             // Checked against a whitelist for security
             $allowed_status = apply_filters( 'groups_allowed_status', array( 'public', 'private', 'hidden' ) );
             $status         = ( in_array( $_POST['group-status'], (array)$allowed_status ) ) ? $_POST['group-status'] : 'public';
-            
+
             // Checked against a whitelist for security
             $allowed_invite_status = apply_filters( 'groups_allowed_invite_status', array( 'members', 'mods', 'admins' ) );
@@ -615 +615 @@
                 $user_id = bp_action_variable( 3 );
                 $status  = bp_action_variable( 2 );
-                
+
                 // Check the nonce first.
                 if ( !check_admin_referer( 'groups_promote_member' ) )
@@ -653 +653 @@
             if ( bp_is_action_variable( 'ban', 1 ) && is_numeric( bp_action_variable( 2 ) ) ) {
                 $user_id = bp_action_variable( 2 );
-                
+
                 // Check the nonce first.
                 if ( !check_admin_referer( 'groups_ban_member' ) )
@@ -671 +671 @@
             if ( bp_is_action_variable( 'unban', 1 ) && is_numeric( bp_action_variable( 2 ) ) ) {
                 $user_id = bp_action_variable( 2 );
-                
+
                 // Check the nonce first.
                 if ( !check_admin_referer( 'groups_unban_member' ) )
@@ -689 +689 @@
             if ( bp_is_action_variable( 'remove', 1 ) && is_numeric( bp_action_variable( 2 ) ) ) {
                 $user_id = bp_action_variable( 2 );
-                
+
                 // Check the nonce first.
                 if ( !check_admin_referer( 'groups_remove_member' ) )

trunk/bp-loader.php

@@ -31 +31 @@
 // Define on which blog ID BuddyPress should run
 if ( !defined( 'BP_ROOT_BLOG' ) ) {
-    
+
     // Root blog is the main site on this network
     if ( is_multisite() && !defined( 'BP_ENABLE_MULTIBLOG' ) ) {
         $current_site = get_current_site();
         $root_blog_id = $current_site->blog_id;
-        
+
     // Root blog is every site on this network
     } elseif ( is_multisite() && defined( 'BP_ENABLE_MULTIBLOG' ) ) {
         $root_blog_id = get_current_blog_id();
-        
+
     // Root blog is the only blog on this network
     } elseif( !is_multisite() ) {
@@ -98 +98 @@
 if ( !function_exists( 'bp_loader_activate' ) ) :
 /**
- * Defines BP's activation routine. 
- * 
- * Most of BP's crucial setup is handled by the setup wizard. This function takes care of some 
- * issues with incompatible legacy themes, and provides a hook for other functions to know that 
- * BP has been activated. 
- * 
- * @package BuddyPress Core 
-*/ 
+ * Defines BP's activation routine.
+ *
+ * Most of BP's crucial setup is handled by the setup wizard. This function takes care of some
+ * issues with incompatible legacy themes, and provides a hook for other functions to know that
+ * BP has been activated.
+ *
+ * @package BuddyPress Core
+*/
 function bp_loader_activate() {
     // Force refresh theme roots.

trunk/bp-members/bp-members-actions.php

@@ -107 +107 @@
         // Allow plugins to do neat things
         do_action( 'bp_core_action_set_spammer_status', bp_displayed_user_id(), $is_spam );
-        
+
         // Redirect back to where we came from
         bp_core_redirect( wp_get_referer() );

trunk/bp-members/bp-members-adminbar.php

@@ -111 +111 @@
         'href'   => bp_get_members_component_link( 'profile', 'edit' )
     ) );
-    
+
     // User Admin > Edit this user's avatar
     $wp_admin_bar->add_menu( array(
@@ -119 +119 @@
         'href'   => bp_get_members_component_link( 'profile', 'change-avatar' )
     ) );
-    
+
     // User Admin > Spam/unspam
     if ( !bp_core_is_user_spammer( bp_displayed_user_id() ) ) {
@@ -127 +127 @@
             'title'  => __( 'Mark as Spammer', 'buddypress' ),
             'href'   => wp_nonce_url( bp_displayed_user_domain() . 'admin/mark-spammer/', 'mark-unmark-spammer' ),
-            'meta'   => array( 'onclick' => 'confirm(" ' . __( 'Are you sure you want to mark this user as a spammer?', 'buddypress' ) . '");' ) 
-        ) );    
+            'meta'   => array( 'onclick' => 'confirm(" ' . __( 'Are you sure you want to mark this user as a spammer?', 'buddypress' ) . '");' )
+        ) );
     } else {
         $wp_admin_bar->add_menu( array(
@@ -135 +135 @@
             'title'  => __( 'Not a Spammer', 'buddypress' ),
             'href'   => wp_nonce_url( bp_displayed_user_domain() . 'admin/unmark-spammer/', 'mark-unmark-spammer' ),
-            'meta'   => array( 'onclick' => 'confirm(" ' . __( 'Are you sure you want to mark this user as not a spammer?', 'buddypress' ) . '");' ) 
-        ) );
-    }
-    
+            'meta'   => array( 'onclick' => 'confirm(" ' . __( 'Are you sure you want to mark this user as not a spammer?', 'buddypress' ) . '");' )
+        ) );
+    }
+
     // User Admin > Delete Account
     $wp_admin_bar->add_menu( array(
@@ -145 +145 @@
         'title'  => __( 'Delete Account', 'buddypress' ),
         'href'   => wp_nonce_url( bp_displayed_user_domain() . 'admin/delete-user/', 'delete-user' ),
-        'meta'   => array( 'onclick' => 'confirm(" ' . __( "Are you sure you want to delete this user's account?", 'buddypress' ) . '");' ) 
+        'meta'   => array( 'onclick' => 'confirm(" ' . __( "Are you sure you want to delete this user's account?", 'buddypress' ) . '");' )
     ) );
 }
@@ -161 +161 @@
     if ( !is_user_logged_in() )
         return false;
-        
+
     if ( $notifications = bp_core_get_notifications_for_user( bp_loggedin_user_id(), 'object' ) ) {
         $menu_title = sprintf( __( 'Notifications <span id="ab-pending-notifications" class="pending-count">%s</span>', 'buddypress' ), count( $notifications ) );
@@ -167 +167 @@
         $menu_title = __( 'Notifications', 'buddypress' );
     }
-    
+
     // Add the top-level Notifications button
     $wp_admin_bar->add_menu( array(
@@ -174 +174 @@
         'href'  => bp_loggedin_user_domain()
     ) );
-    
+
     if ( !empty( $notifications ) ) {
         foreach ( (array)$notifications as $notification ) {
@@ -192 +192 @@
         ) );
     }
-    
+
     return;
 }

trunk/bp-members/bp-members-buddybar.php

@@ -100 +100 @@
 
     <li id="bp-adminbar-adminoptions-menu">
-        
+
         <a href=""><?php _e( 'Admin Options', 'buddypress' ) ?></a>
 
@@ -109 +109 @@
 
             <?php endif ?>
-            
+
             <li><a href="<?php bp_members_component_link( 'profile', 'change-avatar' ); ?>"><?php printf( __( "Edit %s's Avatar", 'buddypress' ), esc_attr( $bp->displayed_user->fullname ) ) ?></a></li>
-            
+
             <?php if ( !bp_core_is_user_spammer( $bp->displayed_user->id ) ) : ?>
 
@@ -120 +120 @@
                 <li><a href="<?php echo wp_nonce_url( $bp->displayed_user->domain . 'admin/unmark-spammer/', 'mark-unmark-spammer' ) ?>" class="confirm"><?php _e( "Not a Spammer", 'buddypress' ) ?></a></li>
 
-            <?php endif; ?>         
-    
+            <?php endif; ?>
+
             <li><a href="<?php echo wp_nonce_url( $bp->displayed_user->domain . 'admin/delete-user/', 'delete-user' ) ?>" class="confirm"><?php printf( __( "Delete %s's Account", 'buddypress' ), esc_attr( $bp->displayed_user->fullname ) ); ?></a></li>
 

trunk/bp-members/bp-members-functions.php

@@ -510 +510 @@
     if ( empty( $user ) ) {
         $is_spammer = false;
-        
+
     // User found
     } else {
@@ -548 +548 @@
     if ( empty( $user ) ) {
         $is_deleted = true;
-        
+
     // User found
     } else {

trunk/bp-members/bp-members-notifications.php

@@ -59 +59 @@
     if ( empty( $grouped_notifications ) )
         return false;
-    
+
     $renderable = array();
-    
+
     // Calculate a renderable output for each notification type
     foreach ( (array)$grouped_notifications as $component_name => $action_arrays ) {
@@ -76 +76 @@
             if ( isset( $bp->{$component_name}->format_notification_function ) && function_exists( $bp->{$component_name}->format_notification_function ) ) {
                 $renderable[] = call_user_func( $bp->{$component_name}->format_notification_function, $component_action_name, $component_action_items[0]->item_id, $component_action_items[0]->secondary_item_id, $action_item_count );
-            } elseif ( isset( $bp->{$component_name}->notification_callback ) && function_exists( $bp->{$component_name}->notification_callback ) ) { 
+            } elseif ( isset( $bp->{$component_name}->notification_callback ) && function_exists( $bp->{$component_name}->notification_callback ) ) {
                 if ( 'object' == $format ) {
                     $content = call_user_func( $bp->{$component_name}->notification_callback, $component_action_name, $component_action_items[0]->item_id, $component_action_items[0]->secondary_item_id, $action_item_count, 'array' );
-                    
+
                     $notification_object = new stdClass;
-                    
+
                     // Minimal backpat with non-compatible notification
                     // callback functions
@@ -91 +91 @@
                         $notification_object->href    = $content['link'];
                     }
-                    
+
                     $notification_object->id = $component_action_items[0]->id;
-                    
+
                     $renderable[]     = $notification_object;
                 } else {

trunk/bp-members/bp-members-signup.php

@@ -374 +374 @@
     if ( is_multisite() ) {
         wpmu_signup_user( $user_login, $user_email, $usermeta );
-        
+
         // On multisite, the user id is not created until the user activates the account
         // but we need to cast $user_id to pass to the filters

trunk/bp-members/bp-members-template.php

@@ -896 +896 @@
     function bp_get_displayed_user_username() {
         global $bp;
-        
+
         if ( !empty( $bp->displayed_user->id ) ) {
             $username = bp_core_get_username( $bp->displayed_user->id, $bp->displayed_user->userdata->user_nicename, $bp->displayed_user->userdata->user_login );
@@ -902 +902 @@
             $username = '';
         }
-        
+
         return apply_filters( 'bp_get_displayed_user_username', $username );
     }
@@ -911 +911 @@
     function bp_get_loggedin_user_username() {
         global $bp;
-        
+
         if ( !empty( $bp->loggedin_user->id ) ) {
             $username = bp_core_get_username( $bp->loggedin_user->id, $bp->loggedin_user->userdata->user_nicename, $bp->loggedin_user->userdata->user_login );
@@ -917 +917 @@
             $username = '';
         }
-        
+
         return apply_filters( 'bp_get_loggedin_user_username', $username );
     }

trunk/bp-messages/bp-messages-actions.php

@@ -16 +16 @@
 
     $thread_id = (int)bp_action_variable( 0 );
-    
+
     if ( !$thread_id || !messages_is_valid_thread( $thread_id ) || ( !messages_check_thread_access( $thread_id ) && !is_super_admin() ) )
         bp_core_redirect( bp_displayed_user_domain() . bp_get_messages_slug() );
@@ -37 +37 @@
     // Mark message read
     messages_mark_thread_read( $thread_id );
-    
+
     // Decrease the unread count in the nav before it's rendered
     $name = sprintf( __( 'Messages <span>%s</span>', 'buddypress' ), bp_get_total_unread_messages_count() );
-    
+
     $bp->bp_nav[$bp->messages->slug]['name'] = $name;
 
@@ -67 +67 @@
 
     $thread_id = bp_action_variable( 1 );
-    
+
     if ( !$thread_id || !is_numeric( $thread_id ) || !messages_check_thread_access( $thread_id ) ) {
         bp_core_redirect( bp_displayed_user_domain() . bp_get_messages_slug() . '/' . bp_current_action() );

trunk/bp-messages/bp-messages-classes.php

@@ -95 +95 @@
         elseif ( $type == 'read' )
             $type_sql = $wpdb->prepare( " AND r.unread_count = 0 " );
-        
+
         if ( 'sentbox' == $box ) {
             $thread_ids = $wpdb->get_results( $wpdb->prepare( "SELECT m.thread_id, MAX(m.date_sent) AS date_sent FROM {$bp->messages->table_name_recipients} r, {$bp->messages->table_name_messages} m WHERE m.thread_id = r.thread_id AND m.sender_id = r.user_id AND m.sender_id = %d AND r.is_deleted = 0 GROUP BY m.thread_id ORDER BY date_sent DESC {$pag_sql}", $user_id ) );
@@ -254 +254 @@
         $this->__construct( $id );
     }
-    
+
     function __construct( $id = null ) {
         global $bp;
@@ -379 +379 @@
         $this->__construct($id);
     }
-    
+
     function __construct( $id = null ) {
         if ( $id ) {

trunk/bp-messages/bp-messages-functions.php

@@ -57 +57 @@
 
         $recipient_ids      = array();
-        
+
         // Invalid recipients are added to an array, for future enhancements
         $invalid_recipients = array();
@@ -72 +72 @@
 
             } else {
-                if ( bp_is_username_compatibility_mode() ) 
-                    $recipient_id = bp_core_get_userid( $recipient ); 
+                if ( bp_is_username_compatibility_mode() )
+                    $recipient_id = bp_core_get_userid( $recipient );
                 else
                     $recipient_id = bp_core_get_userid_from_nicename( $recipient );
             }
-            
+
             if ( !$recipient_id )
                 $invalid_recipients[] = $recipient;
@@ -236 +236 @@
         $link  = bp_loggedin_user_domain() . bp_get_messages_slug() . '/inbox';
         $title = __( 'Inbox', 'buddypress' );
-        
+
         if ( (int)$total_items > 1 ) {
             $text = sprintf( __('You have %d new messages', 'buddypress' ), (int)$total_items );

trunk/bp-messages/bp-messages-loader.php

@@ -69 +69 @@
             'table_name_recipients' => $bp->table_prefix . 'bp_messages_recipients'
         );
-        
+
         // All globals for messaging component.
         // Note that global_tables is included in this array.

trunk/bp-messages/bp-messages-screens.php

@@ -92 +92 @@
 
     $notice_id = (int)bp_action_variable( 1 );
-    
+
     if ( !empty( $notice_id ) && is_numeric( $notice_id ) ) {
         $notice = new BP_Messages_Notice( $notice_id );

trunk/bp-themes/bp-default/_inc/css/default-rtl.css

@@ -1 +1 @@
 /*--------------------------------------------------------------
 Hello, this is the BuddyPress Default rtl stylesheet.
-Right to left styles. This will transform the theme to read from 
+Right to left styles. This will transform the theme to read from
 right to left for languages that support this method.
 ----------------------------------------------------------------
@@ -34 +34 @@
     5.7 - Topics and Tables - Forums and General
     5.8 - Headers, Lists and Tabs - Activity, Groups, Blogs, Forums
-    5.9 - Private Messaging Threads 
+    5.9 - Private Messaging Threads
 --------------------------------------------------------------*/
 /*--------------------------------------------------------------
@@ -239 +239 @@
     float: right;
 }
-#nav li li { 
+#nav li li {
     margin-left: auto;
-    margin-right: 0; 
+    margin-right: 0;
 }
 #nav ul,

trunk/bp-themes/bp-default/_inc/css/default.css

@@ -1307 +1307 @@
     border-radius: 3px;
     color: #fff;
-    font-size: 90%; 
+    font-size: 90%;
     margin-left: 2px;
     padding: 0 5px;
@@ -2188 +2188 @@
 }
 div.item-list-tabs ul li a span {
-    background: #1fb3dd; 
+    background: #1fb3dd;
     -moz-border-radius: 3px;
     -webkit-border-radius: 3px;
@@ -2194 +2194 @@
     color: #fff;
     display: inline;
-    font-size: 90%; 
+    font-size: 90%;
     margin-left: 2px;
     padding: 1px 6px;

trunk/bp-themes/bp-default/_inc/global.js

@@ -929 +929 @@
 
                     jq('a#user-messages span').html( inboxcount );
-                    
+
                     if ( i != checkboxes.length - 1 ) {
                         checkboxes_tosend += ','

trunk/bp-themes/bp-default/activity/comment.php

@@ -10 +10 @@
  * @subpackage bp-default
  */
- 
+
 ?>
 

trunk/bp-themes/bp-default/activity/entry.php

@@ -91 +91 @@
 
         <div class="activity-comments">
-            
+
             <?php bp_activity_comments(); ?>
 

trunk/bp-themes/bp-default/groups/create.php

@@ -108 +108 @@
 
                     <hr />
-                    
-                    <h4><?php _e( 'Group Invitations', 'buddypress' ); ?></h4> 
-
-                    <p><?php _e( 'Which members of this group are allowed to invite others?', 'buddypress' ) ?></p> 
-                
-                    <div class="radio"> 
-                        <label> 
-                            <input type="radio" name="group-invite-status" value="members"<?php bp_group_show_invite_status_setting( 'members' ) ?> /> 
-                            <strong><?php _e( 'All group members', 'buddypress' ) ?></strong> 
-                        </label> 
-                
-                        <label> 
-                            <input type="radio" name="group-invite-status" value="mods"<?php bp_group_show_invite_status_setting( 'mods' ) ?> /> 
-                            <strong><?php _e( 'Group admins and mods only', 'buddypress' ) ?></strong> 
-                        </label>
-                        
-                        <label> 
-                            <input type="radio" name="group-invite-status" value="admins"<?php bp_group_show_invite_status_setting( 'admins' ) ?> /> 
-                            <strong><?php _e( 'Group admins only', 'buddypress' ) ?></strong> 
-                        </label> 
-                    </div> 
-                
-                    <hr /> 
+
+                    <h4><?php _e( 'Group Invitations', 'buddypress' ); ?></h4>
+
+                    <p><?php _e( 'Which members of this group are allowed to invite others?', 'buddypress' ) ?></p>
+
+                    <div class="radio">
+                        <label>
+                            <input type="radio" name="group-invite-status" value="members"<?php bp_group_show_invite_status_setting( 'members' ) ?> />
+                            <strong><?php _e( 'All group members', 'buddypress' ) ?></strong>
+                        </label>
+
+                        <label>
+                            <input type="radio" name="group-invite-status" value="mods"<?php bp_group_show_invite_status_setting( 'mods' ) ?> />
+                            <strong><?php _e( 'Group admins and mods only', 'buddypress' ) ?></strong>
+                        </label>
+
+                        <label>
+                            <input type="radio" name="group-invite-status" value="admins"<?php bp_group_show_invite_status_setting( 'admins' ) ?> />
+                            <strong><?php _e( 'Group admins only', 'buddypress' ) ?></strong>
+                        </label>
+                    </div>
+
+                    <hr />
 
                     <?php do_action( 'bp_after_group_settings_creation_step' ); ?>

trunk/bp-themes/bp-default/groups/single/forum/edit.php

@@ -52 +52 @@
                     <label for="topic_text"><?php _e( 'Content:', 'buddypress' ); ?></label>
                     <textarea name="topic_text" id="topic_text"><?php bp_the_topic_text(); ?></textarea>
-                    
+
                     <label><?php _e( 'Tags (comma separated):', 'buddypress' ) ?></label>
                     <input type="text" name="topic_tags" id="topic_tags" value="<?php bp_forum_topic_tag_list() ?>" />

trunk/bp-themes/bp-default/groups/single/forum/topic.php

@@ -24 +24 @@
         <div id="topic-meta">
             <h3><?php bp_the_topic_title() ?> (<?php bp_the_topic_total_post_count() ?>)</h3>
-            
+
             <?php if ( bp_forum_topic_has_tags() ) : ?>
-                
+
                 <div class="topic-tags">
-                
+
                     <?php _e( 'Topic tags:', 'buddypress' ) ?> <?php bp_forum_topic_tag_list() ?>
-                
+
                 </div>
-                
+
             <?php endif; ?>
 

trunk/bp-themes/bp-default/groups/single/home.php

@@ -39 +39 @@
                     locate_template( array( 'groups/single/send-invites.php' ), true );
 
-                    elseif ( bp_is_group_forum() && bp_group_is_visible() && bp_is_active( 'forums' ) && bp_forums_is_installed_correctly() ) : 
+                    elseif ( bp_is_group_forum() && bp_group_is_visible() && bp_is_active( 'forums' ) && bp_forums_is_installed_correctly() ) :
                         locate_template( array( 'groups/single/forum.php' ), true );
 

trunk/bp-themes/bp-default/index.php

@@ -5 +5 @@
 
         <?php do_action( 'bp_before_blog_home' ) ?>
-        
+
         <?php do_action( 'template_notices' ) ?>
 

trunk/bp-themes/bp-default/members/single/activity.php

@@ -16 +16 @@
 
         <li id="activity-filter-select" class="last">
-            <label for="activity-filter-by"><?php _e( 'Show:', 'buddypress' ); ?></label> 
+            <label for="activity-filter-by"><?php _e( 'Show:', 'buddypress' ); ?></label>
             <select id="activity-filter-by">
                 <option value="-1"><?php _e( 'Everything', 'buddypress' ) ?></option>

trunk/bp-themes/bp-default/members/single/forums/topics.php

@@ -1 +1 @@
 <?php
-/* 
+/*
  * To change this template, choose Tools | Templates
  * and open the template in the editor.

trunk/bp-themes/bp-default/members/single/home.php

@@ -38 +38 @@
 
                 <?php do_action( 'bp_before_member_body' );
-                
+
                 if ( bp_is_user_activity() || !bp_current_component() ) :
                     locate_template( array( 'members/single/activity.php' ), true );

trunk/bp-xprofile/bp-xprofile-actions.php

@@ -23 +23 @@
 function xprofile_action_delete_avatar() {
     global $bp;
-    
+
     if ( !bp_is_current_component( 'profile' ) || !bp_is_current_action( 'change-avatar' ) || !bp_is_action_variable( 'delete-avatar', 0 ) )
         return false;

trunk/bp-xprofile/bp-xprofile-activity.php

@@ -116 +116 @@
 function bp_xprofile_new_avatar_activity() {
     global $bp;
-    
+
     if ( !bp_is_active( 'activity' ) )
         return false;

trunk/bp-xprofile/bp-xprofile-classes.php

@@ -168 +168 @@
             if ( !empty( $field_ids ) )
                 $field_data = $wpdb->get_results( $wpdb->prepare( "SELECT field_id, value FROM {$bp->profile->table_name_data} WHERE field_id IN ( {$field_ids_sql} ) AND user_id = %d", $user_id ) );
-                
+
             // Remove data-less fields, if necessary
             if ( $hide_empty_fields ) {
-            
+
                 // Loop through the results and find the fields that have data.
                 foreach( (array)$field_data as $data ) {
@@ -179 +179 @@
                     }
                 }
-                
+
                 // The remaining members of $field_ids are empty. Remove them.
                 foreach( $fields as $field_key => $field ) {
@@ -186 +186 @@
                     }
                 }
-                
+
                 // Reset indexes
                 $fields = array_values( $fields );
-                
-            }
-            
+
+            }
+
             // Field data was found
             if ( !empty( $field_data ) && !is_wp_error( $field_data ) ) {
-                
+
                 // Loop through fields
                 foreach( (array)$fields as $field_key => $field ) {
-                    
+
                     // Loop throught the data in each field
                     foreach( (array)$field_data as $data ) {
-                    
+
                         // Assign correct data value to the field
                         if ( $field->id == $data->field_id )
                             $fields[$field_key]->data->value = $data->value;
-                    }   
-                }   
+                    }
+                }
             }
         }
@@ -215 +215 @@
                     $groups[$group_key]->fields[] = $field;
             }
-            
+
             // When we unset fields above, we may have created empty groups.
             // Remove them, if necessary.
@@ -221 +221 @@
                 unset( $groups[$group_key] );
             }
-            
+
             // Reset indexes
             $groups = array_values( $groups );
@@ -328 +328 @@
     var $message = null;
     var $message_type = 'err';
-    
+
     function bp_xprofile_field( $id = null, $user_id = null, $get_data = true ) {
         $this->__construct( $id, $user_id, $get_data );
     }
-    
+
     function __construct( $id = null, $user_id = null, $get_data = true ) {
         if ( $id )
@@ -794 +794 @@
     var $value;
     var $last_updated;
-    
+
     function bp_xprofile_profiledata( $field_id = null, $user_id = null ) {
-        $this->__construct( $field_id, $user_id );      
-    }
-    
+        $this->__construct( $field_id, $user_id );
+    }
+
     function __construct( $field_id = null, $user_id = null ) {
         if ( $field_id )

trunk/bp-xprofile/bp-xprofile-filters.php

@@ -98 +98 @@
             $filtered_value     = wp_rel_nofollow( force_balance_tags( $kses_field_value ) );
             $filtered_values[] = apply_filters( 'xprofile_filtered_data_value_before_save', $filtered_value, $value );
-            
+
         }
 

trunk/bp-xprofile/bp-xprofile-screens.php

@@ -15 +15 @@
  * @uses bp_core_load_template() Looks for and loads a template file within the current member theme (folder/filename)
  */
-function xprofile_screen_display_profile() {    
+function xprofile_screen_display_profile() {
     $new = isset( $_GET['new'] ) ? $_GET['new'] : '';
 

trunk/bp-xprofile/bp-xprofile-template.php

@@ -196 +196 @@
     function bp_get_field_css_class( $class = false ) {
         global $profile_template;
-        
+
         $css_classes = array();
 
@@ -710 +710 @@
         if ( !$group_id = bp_action_variable( 1 ) )
             $group_id = 1;
-            
+
         if ( !is_numeric( $group_id ) )
             $group_id = 1;