Changeset 2077 for trunk/bp-core.php

Timestamp:

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

Author:

apeatling

Message:

Merging 1.1 branch changes and syncing.

File:

• trunk/bp-core.php (modified) (124 diffs)

trunk/bp-core.php

@@ -4 +4 @@
 define( 'BP_CORE_DB_VERSION', '1800' );
 
-/*** 
- * Define the path and url of the BuddyPress plugins directory. 
- * It is important to use plugins_url() core function to obtain 
- * the correct scheme used (http or https). 
+/***
+ * Define the path and url of the BuddyPress plugins directory.
+ * It is important to use plugins_url() core function to obtain
+ * the correct scheme used (http or https).
  */
 define( 'BP_PLUGIN_DIR', WP_PLUGIN_DIR . '/buddypress' );
@@ -66 +66 @@
 if ( !defined( 'BP_HOME_BLOG_SLUG' ) )
     define( 'BP_HOME_BLOG_SLUG', 'blog' );
-    
+
+/* Register BuddyPress themes contained within the theme folder */
+if ( function_exists( 'register_theme_folder' ) )
+    register_theme_folder( 'buddypress/bp-themes' );
+
 /* Register BuddyPress themes contained within the theme folder */
 if ( function_exists( 'register_theme_folder' ) )
@@ -94 +98 @@
     global $displayed_user_id;
     global $action_variables;
-    
+
     $current_user = wp_get_current_user();
 
-    /* The domain for the root of the site where the main blog resides */   
+    /* The domain for the root of the site where the main blog resides */
     $bp->root_domain = bp_core_get_root_domain();
-    
+
     /* The user ID of the user who is currently logged in. */
     $bp->loggedin_user->id = $current_user->ID;
@@ -105 +109 @@
     /* The domain for the user currently logged in. eg: http://domain.com/members/andy */
     $bp->loggedin_user->domain = bp_core_get_user_domain($current_user->ID);
-    
+
     /* The user id of the user currently being viewed, set in /bp-core/bp-core-catchuri.php */
     $bp->displayed_user->id = $displayed_user_id;
-    
+
     /* The domain for the user currently being displayed */
     $bp->displayed_user->domain = bp_core_get_user_domain($displayed_user_id);
-    
+
     /* The component being used eg: http://domain.com/members/andy/ [profile] */
     $bp->current_component = $current_component; // type: string
-    
+
     /* The current action for the component eg: http://domain.com/members/andy/profile/ [edit] */
     $bp->current_action = $current_action; // type: string
-    
+
     /* The action variables for the current action eg: http://domain.com/members/andy/profile/edit/ [group] / [6] */
     $bp->action_variables = $action_variables; // type: array
-    
+
     /* Only used where a component has a sub item, e.g. groups: http://domain.com/members/andy/groups/ [my-group] / home - manipulated in the actual component not in catch uri code.*/
     $bp->current_item = ''; // type: string
@@ -135 +139 @@
     /* Sets up the array container for the component navigation rendered by bp_get_nav() */
     $bp->bp_nav = array();
-    
+
     /* Sets up the array container for the component options navigation rendered by bp_get_options_nav() */
     $bp->bp_options_nav = array();
-    
+
     /* Sets up container used for the title of the current component option and rendered by bp_get_options_title() */
     $bp->bp_options_title = '';
-    
+
     /* Sets up container used for the avatar of the current component being viewed. Rendered by bp_get_options_avatar() */
     $bp->bp_options_avatar = '';
-    
+
     /* Contains an array of all the active components. The key is the slug, value the internal ID of the component */
     $bp->active_components = array();
-    
+
     /* Fetches the default Gravatar image to use if the user/group/blog has no avatar or gravatar */
     $bp->grav_default->user = apply_filters( 'bp_user_gravatar_default', get_site_option( 'user-avatar-default' ) );
     $bp->grav_default->group = apply_filters( 'bp_group_gravatar_default', 'identicon' );
     $bp->grav_default->blog = apply_filters( 'bp_blog_gravatar_default', 'identicon' );
-    
+
     /* Fetch the full name for the logged in and current user */
     $bp->loggedin_user->fullname = bp_core_get_user_displayname( $bp->loggedin_user->id );
@@ -162 +166 @@
        'is_item_admin' would be 1 if they are a group admin, 0 if they are not. */
     $bp->is_item_admin = bp_is_home();
-    
+
     /* Used to determine if the logged in user is a moderator for the current content. */
     $bp->is_item_mod = false;
@@ -170 +174 @@
     if ( !$bp->current_component )
         $bp->current_component = $bp->default_component;
-    
+
     do_action( 'bp_core_setup_globals' );
 }
@@ -183 +187 @@
  *
  * For example: http://example.org/search or http://example.org/members
- * 
+ *
  * @package BuddyPress Core
  * @uses bp_core_add_root_component() Adds a slug to the root components global variable.
@@ -202 +206 @@
  *
  * Installs the core DB tables for BuddyPress.
- * 
+ *
  * @package BuddyPress Core
  * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
@@ -211 +215 @@
 function bp_core_install() {
     global $wpdb, $bp;
-    
+
     if ( !empty($wpdb->charset) )
         $charset_collate = "DEFAULT CHARACTER SET $wpdb->charset";
-    
+
     $sql[] = "CREATE TABLE {$bp->core->table_name_notifications} (
                 id bigint(20) NOT NULL AUTO_INCREMENT PRIMARY KEY,
@@ -235 +239 @@
     require_once( ABSPATH . 'wp-admin/upgrade-functions.php' );
     dbDelta( $sql );
-    
+
     /* Add names of root components to the banned blog list to avoid conflicts */
     bp_core_add_illegal_names();
-    
+
     update_site_option( 'bp-core-db-version', BP_CORE_DB_VERSION );
 }
@@ -246 +250 @@
  *
  * Checks to make sure the database tables are set up for the core component.
- * 
+ *
  * @package BuddyPress Core
  * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
@@ -260 +264 @@
     if ( !is_site_admin() )
         return false;
-    
+
     require ( BP_PLUGIN_DIR . '/bp-core/bp-core-admin.php' );
 
@@ -273 +277 @@
  *
  * Adds the "BuddyPress" admin submenu item to the Site Admin tab.
- * 
+ *
  * @package BuddyPress Core
  * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
@@ -281 +285 @@
  */
 function bp_core_add_admin_menu() {
-    global $wpdb, $bp, $menu;
-    
     if ( !is_site_admin() )
         return false;
-        
+
     /* Add the administration tab under the "Site Admin" tab for site administrators */
     bp_core_add_admin_menu_page( array(
@@ -294 +296 @@
         'position' => 2
     ) );
-    
+
     add_submenu_page( 'bp-general-settings', __( 'General Settings', 'buddypress'), __( 'General Settings', 'buddypress' ), 'manage_options', 'bp-general-settings', 'bp_core_admin_settings' );
     add_submenu_page( 'bp-general-settings', __( 'Component Setup', 'buddypress'), __( 'Component Setup', 'buddypress' ), 'manage_options', 'bp-component-setup', 'bp_core_admin_component_setup' );
@@ -305 +307 @@
  * Checks to see if a component's URL should be in the root, not under a member page:
  * eg: http://domain.com/groups/the-group NOT http://domain.com/members/andy/groups/the-group
- * 
+ *
  * @package BuddyPress Core
  * @return true if root component, else false.
@@ -319 +321 @@
  *
  * Sets up the profile navigation item if the Xprofile component is not installed.
- * 
+ *
  * @package BuddyPress Core
  * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
@@ -329 +331 @@
 function bp_core_setup_nav() {
     global $bp;
-    
-    /*** 
+
+    /***
      * If the extended profiles component is disabled, we need to revert to using the
      * built in WordPress profile information
@@ -340 +342 @@
 
         /* Add 'Profile' to the main navigation */
-        bp_core_new_nav_item( array( 
+        bp_core_new_nav_item( array(
             'name' => __('Profile', 'buddypress'),
             'slug' => $bp->core->profile->slug,
@@ -349 +351 @@
 
         $profile_link = $bp->loggedin_user->domain . '/profile/';
-        
+
         /* Add the subnav items to the profile */
         bp_core_new_subnav_item( array(
@@ -358 +360 @@
             'screen_function' => 'bp_core_catch_profile_uri'
         ) );
-        
+
 
         if ( 'profile' == $bp->current_component ) {
@@ -365 +367 @@
             } else {
                 $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;
             }
         }
-    }   
+    }
 }
 add_action( 'plugins_loaded', 'bp_core_setup_nav' );
@@ -397 +399 @@
  * Listens to the $bp component and action variables to determine if the user is viewing the members
  * directory page. If they are, it will set up the directory and load the members directory template.
- * 
+ *
  * @package BuddyPress Core
  * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
@@ -421 +423 @@
  * this action will fire and mark or unmark the user and their blogs as spam.
  * Must be a site admin for this function to run.
- * 
+ *
  * @package BuddyPress Core
  * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
@@ -427 +429 @@
 function bp_core_action_set_spammer_status() {
     global $bp;
-    
+
     if ( !is_site_admin() || bp_is_home() || !$bp->displayed_user->id )
         return false;
-            
+
     if ( 'admin' == $bp->current_component && ( 'mark-spammer' == $bp->current_action || 'unmark-spammer' == $bp->current_action ) ) {
         /* Check the nonce */
@@ -437 +439 @@
         /* Get the functions file */
         require( ABSPATH . 'wp-admin/includes/mu.php' );
-        
+
         if ( 'mark-spammer' == $bp->current_action )
             $is_spam = 1;
@@ -445 +447 @@
         /* Get the blogs for the user */
         $blogs = get_blogs_of_user( $bp->displayed_user->id, true );
-    
+
         foreach ( (array) $blogs as $key => $details ) {
             /* Do not mark the main or current root blog as spam */
-            if ( 1 == $details->userblog_id || BP_ROOT_BLOG == $details->userblog_id ) 
-                continue; 
-        
+            if ( 1 == $details->userblog_id || BP_ROOT_BLOG == $details->userblog_id )
+                continue;
+
             /* Update the blog status */
             update_blog_status( $details->userblog_id, 'spam', $is_spam );
-        
+
             /* Fire the standard WPMU hook */
             do_action( 'make_spam_blog', $details->userblog_id );
         }
-    
+
         /* Finally, mark this user as a spammer */
         update_user_status( $bp->displayed_user->id, 'spam', $is_spam, 1 );
-        
+
         if ( $is_spam )
             bp_core_add_message( __( 'User marked as spammer. Spam users are visible only to site admins.', 'buddypress' ) );
         else
             bp_core_add_message( __( 'User removed as spammer.', 'buddypress' ) );
-            
+
         do_action( 'bp_core_action_set_spammer_status' );
-        
+
         bp_core_redirect( wp_get_referer() );
     }
@@ -477 +479 @@
  *
  * Allows a site admin to delete a user from the adminbar menu.
- * 
+ *
  * @package BuddyPress Core
  * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
@@ -483 +485 @@
 function bp_core_action_delete_user() {
     global $bp;
-    
+
     if ( !is_site_admin() || bp_is_home() || !$bp->displayed_user->id )
         return false;
-            
+
     if ( 'admin' == $bp->current_component && 'delete-user' == $bp->current_action ) {
         /* Check the nonce */
@@ -492 +494 @@
 
         $errors = false;
-        
+
         if ( bp_core_delete_account( $bp->displayed_user->id ) ) {
             bp_core_add_message( sprintf( __( '%s has been deleted from the system.', 'buddypress' ), $bp->displayed_user->fullname ) );
@@ -499 +501 @@
             $errors = true;
         }
-        
+
         do_action( 'bp_core_action_set_spammer_status', $errors );
-        
+
         if ( $errors )
             bp_core_redirect( $bp->displayed_user->domain );
@@ -525 +527 @@
  * Returns the domain for the passed user:
  * e.g. http://domain.com/members/andy/
- * 
+ *
  * @package BuddyPress Core
  * @global $current_user WordPress global variable containing current logged in user information
@@ -533 +535 @@
 function bp_core_get_user_domain( $user_id ) {
     global $bp;
-    
+
     if ( !$user_id ) return;
-    
+
     $ud = get_userdata($user_id);
-    
+
     if ( defined( 'BP_ENABLE_USERNAME_COMPATIBILITY_MODE' ) )
         $username = $ud->user_login;
     else
         $username = $ud->user_nicename;
-    
+
     /* If we are using a members slug, include it. */
     if ( !defined( 'BP_ENABLE_ROOT_PROFILES' ) )
         return apply_filters( 'bp_core_get_user_domain', $bp->root_domain . '/' . BP_MEMBERS_SLUG . '/' . $username . '/' );
     else
-        return apply_filters( 'bp_core_get_user_domain', $bp->root_domain . '/' . $username . '/' );        
+        return apply_filters( 'bp_core_get_user_domain', $bp->root_domain . '/' . $username . '/' );
 }
 
@@ -555 +557 @@
  * Returns the domain for the root blog.
  * eg: http://domain.com/ OR https://domain.com
- * 
+ *
  * @package BuddyPress Core
  * @uses get_blog_option() WordPress function to fetch blog meta.
@@ -562 +564 @@
 function bp_core_get_root_domain() {
     global $current_blog;
-    
+
     if ( defined( 'BP_ENABLE_MULTIBLOG' ) )
         $domain = get_blog_option( $current_blog->blog_id, 'siteurl' );
@@ -576 +578 @@
  * Returns the user id for the user that is currently being displayed.
  * eg: http://andy.domain.com/ or http://domain.com/andy/
- * 
+ *
  * @package BuddyPress Core
  * @global $current_blog WordPress global containing information and settings for the current blog being viewed.
@@ -590 +592 @@
  *
  * Adds a navigation item to the main navigation array used in BuddyPress themes.
- * 
+ *
  * @package BuddyPress Core
  * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
@@ -614 +616 @@
     if ( empty($name) || empty($slug) )
         return false;
-            
+
     /* If this is for site admins only and the user is not one, don't create the subnav item */
     if ( $site_admin_only && !is_site_admin() )
         return false;
-    
+
     if ( empty( $item_css_id ) )
         $item_css_id = $slug;
@@ -637 +639 @@
     if ( !$show_for_displayed_user && !bp_is_home() )
         return false;
-        
+
     /***
      * If we are not viewing a user, and this is a root component, don't attach the
@@ -660 +662 @@
  *
  * Modify the default subnav item to load when a top level nav item is clicked.
- * 
+ *
  * @package BuddyPress Core
  * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
@@ -666 +668 @@
 function bp_core_new_nav_default( $args = '' ) {
     global $bp;
-    
+
     $defaults = array(
         'parent_slug' => false, // Slug of the parent
@@ -692 +694 @@
  * We can only sort nav items by their position integer at a later point in time, once all
  * plugins have registered their navigation items.
- * 
+ *
  * @package BuddyPress Core
  * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
@@ -698 +700 @@
 function bp_core_sort_nav_items() {
     global $bp;
-    
+
     if ( empty( $bp->bp_nav ) || !is_array( $bp->bp_nav ) )
         return false;
-    
+
     foreach ( $bp->bp_nav as $slug => $nav_item ) {
         if ( empty( $temp[$nav_item['position']]) )
@@ -710 +712 @@
                 $nav_item['position']++;
             } while ( !empty( $temp[$nav_item['position']] ) );
-            
+
             $temp[$nav_item['position']] = $nav_item;
         }
     }
-    
+
     ksort( $temp );
-    $bp->bp_nav = &$temp; 
+    $bp->bp_nav = &$temp;
 }
 add_action( 'wp_head', 'bp_core_sort_nav_items' );
@@ -724 +726 @@
  *
  * Removes a navigation item from the main navigation array.
- * 
+ *
  * @package BuddyPress Core
  * @param $slug The slug of the sub navigation item.
@@ -738 +740 @@
  *
  * Adds a navigation item to the sub navigation array used in BuddyPress themes.
- * 
+ *
  * @package BuddyPress Core
  * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
@@ -756 +758 @@
         'screen_function' => false // The name of the function to run when clicked
     );
-    
+
     $r = wp_parse_args( $args, $defaults );
     extract( $r, EXTR_SKIP );
@@ -763 +765 @@
     if ( empty($name) || empty($slug) || empty($parent_slug) || empty($parent_url) || empty($screen_function) )
         return false;
-    
+
     /* If this is for site admins only and the user is not one, don't create the subnav item */
     if ( $site_admin_only && !is_site_admin() )
         return false;
-    
+
     if ( empty( $item_css_id ) )
         $item_css_id = $slug;
-    
+
     $bp->bp_options_nav[$parent_slug][$slug] = array(
         'name' => $name,
@@ -779 +781 @@
         'user_has_access' => $user_has_access
     );
-        
+
     if ( ( $bp->current_action == $slug && $bp->current_component == $parent_slug ) && $user_has_access ) {
         if ( !is_object( $screen_function[0] ) )
@@ -793 +795 @@
     if ( empty( $bp->bp_options_nav ) || !is_array( $bp->bp_options_nav ) )
         return false;
-    
+
     foreach ( $bp->bp_options_nav as $parent_slug => $subnav_items ) {
         if ( !is_array( $subnav_items ) )
             continue;
-        
+
         foreach ( $subnav_items as $subnav_item ) {
             if ( empty( $temp[$subnav_item['position']]) )
@@ -806 +808 @@
                     $subnav_item['position']++;
                 } while ( !empty( $temp[$subnav_item['position']] ) );
-            
+
                 $temp[$subnav_item['position']] = $subnav_item;
             }
@@ -821 +823 @@
  *
  * Removes a navigation item from the sub navigation array used in BuddyPress themes.
- * 
+ *
  * @package BuddyPress Core
  * @param $parent_id The id of the parent navigation item.
@@ -828 +830 @@
 function bp_core_remove_subnav_item( $parent_id, $slug ) {
     global $bp;
-    
+
     unset( $bp->bp_options_nav[$parent_id][$slug] );
 }
@@ -836 +838 @@
  *
  * Clear the subnav items for a specific nav item.
- * 
+ *
  * @package BuddyPress Core
  * @param $parent_id The id of the parent navigation item.
@@ -856 +858 @@
  * Loads:
  *   wp-content/member-themes/[activated_theme]/profile/edit-profile.php
- * 
+ *
  * @package BuddyPress Core
  * @param $username str Username to check.
@@ -883 +885 @@
  *           http://community.domain.com/members/andy/friends
  *           http://domain.com/wpmu/members/andy/friends
- * 
+ *
  * @package BuddyPress Core
  * @param $slug str The slug of the component
@@ -898 +900 @@
  *
  * Returns the user_id for a user based on their username.
- * 
+ *
  * @package BuddyPress Core
  * @param $username str Username to check.
@@ -907 +909 @@
 function bp_core_get_random_member() {
     global $bp, $wpdb;
-    
+
     if ( isset( $_GET['random-member'] ) ) {
         $user = BP_Core_User::get_random_users(1);
-        
+
         $ud = get_userdata( $user['users'][0]->user_id );
-        
-        bp_core_redirect( bp_core_get_user_domain( $user['users'][0]->user_id ) );      
+
+        bp_core_redirect( bp_core_get_user_domain( $user['users'][0]->user_id ) );
     }
 }
@@ -922 +924 @@
  *
  * Returns the user_id for a user based on their username.
- * 
+ *
  * @package BuddyPress Core
  * @param $username str Username to check.
@@ -931 +933 @@
 function bp_core_get_userid( $username ) {
     global $wpdb;
-    
+
     if ( !empty( $username ) )
-        return apply_filters( 'bp_core_get_userid', $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM " . CUSTOM_USER_TABLE . " WHERE user_login = %s", $username ) ) ); 
+        return apply_filters( 'bp_core_get_userid', $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM " . CUSTOM_USER_TABLE . " WHERE user_login = %s", $username ) ) );
 }
 
@@ -940 +942 @@
  *
  * Returns the username for a user based on their user id.
- * 
+ *
  * @package BuddyPress Core
  * @param $uid int User ID to check.
@@ -950 +952 @@
 function bp_core_get_username( $uid ) {
     global $userdata;
-    
+
     if ( $uid == $userdata->ID )
         $username =  __( 'You', 'buddypress' );
-    
+
     if ( !$ud = get_userdata($uid) )
         return false;
-        
-    $username = $ud->user_login;    
+
+    $username = $ud->user_login;
 
     return apply_filters( 'bp_core_get_username', $username );
@@ -966 +968 @@
  *
  * Returns the URL with no HTML markup for a user based on their user id.
- * 
+ *
  * @package BuddyPress Core
  * @param $uid int User ID to check.
@@ -976 +978 @@
 function bp_core_get_userurl( $uid ) {
     global $bp;
-    
+
     if ( !is_numeric($uid) )
         return false;
@@ -987 +989 @@
  *
  * Returns the email address for the user based on user ID
- * 
+ *
  * @package BuddyPress Core
  * @param $uid int User ID to check.
@@ -1005 +1007 @@
  * eg: <a href="http://andy.domain.com/">Andy Peatling</a>
  * Optional parameters will return just the name, or just the URL, or disable "You" text when
- * user matches the logged in user. 
+ * user matches the logged in user.
  *
  * [NOTES: This function needs to be cleaned up or split into separate functions]
- * 
+ *
  * @package BuddyPress Core
  * @param $uid int User ID to check.
@@ -1023 +1025 @@
 function bp_core_get_userlink( $user_id, $no_anchor = false, $just_link = false, $deprecated = false, $with_s = false ) {
     global $userdata;
-    
+
     $ud = get_userdata($user_id);
-    
+
     if ( !$ud )
         return false;
 
-    if ( function_exists('bp_fetch_user_fullname') ) { 
+    if ( function_exists('bp_fetch_user_fullname') ) {
         $display_name = bp_core_get_user_displayname( $user_id );
-        
+
         if ( $with_s )
             $display_name = sprintf( __( "%s's", 'buddypress' ), $display_name );
-            
+
     } else {
         $display_name = $ud->display_name;
     }
-    
+
     if ( $no_anchor )
         return $display_name;
@@ -1044 +1046 @@
     if ( !$url = bp_core_get_userurl($user_id) )
         return false;
-        
+
     if ( $just_link )
         return $url;
 
-    return '<a href="' . $url . '">' . $display_name . '</a>';  
+    return '<a href="' . $url . '">' . $display_name . '</a>';
 }
 
@@ -1057 +1059 @@
  * Fetch the display name for a user. This will use the "Name" field in xprofile if it is installed.
  * Otherwise, it will fall back to the normal WP display_name, or user_nicename, depending on what has been set.
- * 
+ *
  * @package BuddyPress Core
  * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
@@ -1068 +1070 @@
 function bp_core_get_user_displayname( $user_id ) {
     global $bp;
-    
+
     if ( !$user_id )
         return false;
-        
+
     if ( !$fullname = wp_cache_get( 'bp_user_fullname_' . $user_id, 'bp' ) ) {
         if ( function_exists('xprofile_install') ) {
@@ -1088 +1090 @@
         } else {
             $ud = get_userdata($user_id);
-            
+
             if ( !empty( $ud->display_name ) )
                 $fullname = $ud->display_name;
@@ -1094 +1096 @@
                 $fullname = $ud->user_nicename;
         }
-        
+
         wp_cache_set( 'bp_user_fullname_' . $user_id, $fullname, 'bp' );
     }
-    
+
     return apply_filters( 'bp_core_get_user_displayname', $fullname );
 }
@@ -1109 +1111 @@
  *
  * Returns the user link for the user based on user email address
- * 
+ *
  * @package BuddyPress Core
  * @param $email str The email address for the user.
@@ -1125 +1127 @@
  *
  * Returns the user link for the user based on user's username
- * 
+ *
  * @package BuddyPress Core
  * @param $username str The username for the user.
@@ -1133 +1135 @@
 function bp_core_get_userlink_by_username( $username ) {
     global $wpdb;
-    
-    $user_id = $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM " . CUSTOM_USER_TABLE . " WHERE user_login = %s", $username ) ); 
+
+    $user_id = $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM " . CUSTOM_USER_TABLE . " WHERE user_login = %s", $username ) );
     return apply_filters( 'bp_core_get_userlink_by_username', bp_core_get_userlink( $user_id, false, false, true ) );
 }
@@ -1149 +1151 @@
 function bp_core_is_user_spammer( $user_id ) {
     global $wpdb;
-    
-    return apply_filters( 'bp_core_is_user_spammer', (int) $wpdb->get_var( $wpdb->prepare( "SELECT spam FROM " . CUSTOM_USER_TABLE . " WHERE ID = %d", $user_id ) ) ); 
+
+    return apply_filters( 'bp_core_is_user_spammer', (int) $wpdb->get_var( $wpdb->prepare( "SELECT spam FROM " . CUSTOM_USER_TABLE . " WHERE ID = %d", $user_id ) ) );
 }
 
@@ -1164 +1166 @@
 function bp_core_is_user_deleted( $user_id ) {
     global $wpdb;
-    
-    return apply_filters( 'bp_core_is_user_spammer', (int) $wpdb->get_var( $wpdb->prepare( "SELECT deleted FROM " . CUSTOM_USER_TABLE . " WHERE ID = %d", $user_id ) ) );   
+
+    return apply_filters( 'bp_core_is_user_spammer', (int) $wpdb->get_var( $wpdb->prepare( "SELECT deleted FROM " . CUSTOM_USER_TABLE . " WHERE ID = %d", $user_id ) ) );
 }
 
@@ -1174 +1176 @@
     if ( !$time )
         return false;
-        
+
     $date = date( "F j, Y ", $time );
-    
+
     if ( !$just_date ) {
         $date .= __('at', 'buddypress') . date( ' g:iA', $time );
     }
-    
+
     return $date;
 }
@@ -1189 +1191 @@
  *
  * Adds a feedback (error/success) message to the WP cookie so it can be displayed after the page reloads.
- * 
+ *
  * @package BuddyPress Core
  */
 function bp_core_add_message( $message, $type = false ) {
     global $bp;
-    
+
     if ( !$type )
         $type = 'success';
-    
+
     /* Send the values to the cookie for page reload display */
     @setcookie( 'bp-message', $message, time()+60*60*24, COOKIEPATH );
     @setcookie( 'bp-message-type', $type, time()+60*60*24, COOKIEPATH );
-    
+
     /***
      * Send the values to the $bp global so we can still output messages
@@ -1218 +1220 @@
  * After the message is displayed, it removes the message vars from the cookie so that the message
  * is not shown to the user multiple times.
- * 
+ *
  * @package BuddyPress Core
  * @global $bp_message The message text
@@ -1229 +1231 @@
     if ( empty( $bp->template_message ) )
         $bp->template_message = $_COOKIE['bp-message'];
-    
+
     if ( empty( $bp->template_message_type ) )
         $bp->template_message_type = $_COOKIE['bp-message-type'];
 
     add_action( 'template_notices', 'bp_core_render_message' );
-    
+
     @setcookie( 'bp-message', false, time() - 1000, COOKIEPATH );
     @setcookie( 'bp-message-type', false, time() - 1000, COOKIEPATH );
@@ -1245 +1247 @@
  * Renders a feedback message (either error or success message) to the theme template.
  * The hook action 'template_notices' is used to call this function, it is not called directly.
- * 
+ *
  * @package BuddyPress Core
  * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
@@ -1251 +1253 @@
 function bp_core_render_message() {
     global $bp;
-    
+
     if ( $bp->template_message ) {
         $type = ( 'success' == $bp->template_message_type ) ? 'updated' : 'error';
@@ -1260 +1262 @@
     <?php
         do_action( 'bp_core_render_message' );
-    }   
+    }
 }
 
@@ -1267 +1269 @@
  *
  * Based on function created by Dunstan Orchard - http://1976design.com
- * 
+ *
  * This function will return an English representation of the time elapsed
  * since a given date.
@@ -1273 +1275 @@
  * eg: 4 days
  * eg: 4 weeks and 6 days
- * 
+ *
  * @package BuddyPress Core
  * @param $older_date int Unix timestamp of date you want to calculate the time since for
@@ -1291 +1293 @@
     array( 1, __( 'second', 'buddypress' ), __( 'seconds', 'buddypress' ) )
     );
-    
+
     $older_date = strtotime( gmdate( 'Y-m-d H:i:s', $older_date ) );
 
@@ -1297 +1299 @@
     /* $newer_date will have a value if we want to work out time elapsed between two known dates */
     $newer_date = ( !$newer_date ) ? ( strtotime( gmdate( 'Y-m-d H:i:s' ) ) + ( 60*60*0 ) ) : $newer_date;
-    
+
     /* Difference in seconds */
     $since = $newer_date - $older_date;
-    
+
     if ( 0 > $since )
         return __( '[Use GMT Timezone]', 'buddypress' );
@@ -1327 +1329 @@
         $seconds2 = $chunks[$i + 1][0];
         $name2 = $chunks[$i + 1][1];
-        
+
         //if ( $chunks[$i + 1][1] == __( 'second', 'buddypress' ) ) return $output;
-    
+
         if ( ( $count2 = floor( ( $since - ( $seconds * $count ) ) / $seconds2 ) ) != 0 ) {
             /* Add to output var */
@@ -1349 +1351 @@
  * show the length of time since the user was last active.
  * This function will update that time as a usermeta setting for the user every 5 minutes.
- * 
+ *
  * @package BuddyPress Core
  * @global $userdata WordPress user data for the current logged in user.
@@ -1356 +1358 @@
 function bp_core_record_activity() {
     global $bp;
-    
+
     if ( !is_user_logged_in() )
         return false;
-    
+
     $activity = get_usermeta( $bp->loggedin_user->id, 'last_activity' );
-    
+
     if ( '' == $activity || time() >= strtotime( '+5 minutes', $activity ) )
         update_usermeta( $bp->loggedin_user->id, 'last_activity', time() );
@@ -1372 +1374 @@
  *
  * Formats last activity based on time since date given.
- * 
+ *
  * @package BuddyPress Core
  * @param last_activity_date The date of last activity.
@@ -1384 +1386 @@
     } else {
         if ( strstr( $last_activity_date, '-' ) ) {
-            $last_active = bp_core_time_since( strtotime( $last_activity_date ) ); 
+            $last_active = bp_core_time_since( strtotime( $last_activity_date ) );
         } else {
-            $last_active = bp_core_time_since( $last_activity_date ); 
+            $last_active = bp_core_time_since( $last_activity_date );
         }
-        
+
         $last_active = sprintf( $string, $last_active );
     }
-    
+
     return $last_active;
 }
@@ -1400 +1402 @@
  *
  * Fetch every post that is authored by the given user for the current blog.
- * 
+ *
  * @package BuddyPress Core
  * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
@@ -1408 +1410 @@
 function bp_core_get_all_posts_for_user( $user_id = null ) {
     global $bp, $wpdb;
-    
+
     if ( !$user_id )
         $user_id = $bp->displayed_user->id;
-    
+
     return $wpdb->get_col( $wpdb->prepare( "SELECT post_id FROM $wpdb->posts WHERE post_author = %d AND post_status = 'publish' AND post_type = 'post'", $user_id ) );
 }
@@ -1420 +1422 @@
  *
  * Get the path of of the current site.
- * 
+ *
  * @package BuddyPress Core
  * @global $comment WordPress comment global for the current comment.
@@ -1427 +1429 @@
 function bp_core_get_site_path() {
     global $current_site;
-    
+
     return $current_site->path;
 }
@@ -1435 +1437 @@
  *
  * Performs a status safe wp_redirect() that is compatible with bp_catch_uri()
- * 
+ *
  * @package BuddyPress Core
  * @global $bp_no_status_set Makes sure that there are no conflicts with status_header() called in bp_core_do_catch_uri()
@@ -1443 +1445 @@
 function bp_core_redirect( $location, $status = 302 ) {
     global $bp_no_status_set;
-    
-    // Make sure we don't call status_header() in bp_core_do_catch_uri() 
+
+    // Make sure we don't call status_header() in bp_core_do_catch_uri()
     // as this conflicts with wp_redirect()
     $bp_no_status_set = true;
-    
+
     wp_redirect( $location, $status );
     die;
@@ -1456 +1458 @@
  *
  * Returns the referrer URL without the http(s)://
- * 
+ *
  * @package BuddyPress Core
  * @return The referrer URL
@@ -1473 +1475 @@
  *
  * For example, it would stop someone creating a blog with the slug "groups".
- * 
+ *
  * @package BuddyPress Core
  * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
@@ -1479 +1481 @@
 function bp_core_add_illegal_names() {
     global $bp;
-    
+
     $current = maybe_unserialize( get_site_option( 'illegal_names' ) );
     $bp_illegal_names = $bp->root_components;
-    
+
     if ( is_array( $current ) ) {
         foreach( $bp_illegal_names as $bp_illegal_name ) {
@@ -1501 +1503 @@
  *
  * Sets the "From" name in emails sent to the name of the site and not "WordPress"
- * 
+ *
  * @package BuddyPress Core
  * @uses get_blog_option() fetches the value for a meta_key in the wp_X_options table
@@ -1516 +1518 @@
  *
  * Sets the "From" address in emails sent
- * 
+ *
  * @package BuddyPress Core
  * @global $current_site Object containing current site metadata
@@ -1532 +1534 @@
  *
  * Allows a user to completely remove their account from the system
- * 
+ *
  * @package BuddyPress Core
  * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
@@ -1564 +1566 @@
  *
  * A javascript free implementation of the search functions in BuddyPress
- * 
+ *
  * @package BuddyPress Core
  * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
@@ -1575 +1577 @@
         $search_terms = $_POST['search-terms'];
         $search_which = $_POST['search-which'];
-        
+
         if ( !$slug || empty( $slug ) ) {
             switch ( $search_which ) {
@@ -1596 +1598 @@
             }
         }
-        
+
         $search_url = apply_filters( 'bp_core_search_site', site_url( $slug . $var . urlencode($search_terms) ), $search_terms );
-        
+
         bp_core_redirect( $search_url );
     }
@@ -1607 +1609 @@
 /**
  * bp_core_ucfirst()
- * 
+ *
  * Localization safe ucfirst() support.
- * 
+ *
  * @package BuddyPress Core
  */
@@ -1615 +1617 @@
     if ( function_exists( 'mb_strtoupper' ) && function_exists( 'mb_substr' ) ) {
         $fc = mb_strtoupper( mb_substr( $str, 0, 1 ) );
-        return $fc.mb_substr( $str, 1 );    
+        return $fc.mb_substr( $str, 1 );
     } else {
         return ucfirst( $str );
@@ -1624 +1626 @@
 /**
  * bp_core_strip_username_spaces()
- * 
+ *
  * Strips spaces from usernames that are created using add_user() and wp_insert_user()
- * 
+ *
  * @package BuddyPress Core
  */
@@ -1637 +1639 @@
 /**
  * bp_core_clear_cache()
- * REQUIRES WP-SUPER-CACHE 
- * 
+ * REQUIRES WP-SUPER-CACHE
+ *
  * When wp-super-cache is installed this function will clear cached pages
  * so that success/error messages are not cached, or time sensitive content.
- * 
+ *
  * @package BuddyPress Core
  */
 function bp_core_clear_cache() {
     global $cache_path, $cache_filename;
-    
+
     if ( function_exists( 'prune_super_cache' ) ) {
         do_action( 'bp_core_clear_cache' );
-        
-        return prune_super_cache( $cache_path, true );      
+
+        return prune_super_cache( $cache_path, true );
     }
 }
@@ -1656 +1658 @@
 /**
  * bp_core_print_generation_time()
- * 
+ *
  * Prints the generation time in the footer of the site.
- * 
+ *
  * @package BuddyPress Core
  */
@@ -1671 +1673 @@
 /**
  * bp_core_add_admin_menu_page()
- * 
+ *
  * A better version of add_admin_menu_page() that allows positioning of menus.
- * 
+ *
  * @package BuddyPress Core
  */
@@ -1691 +1693 @@
     $r = wp_parse_args( $args, $defaults );
     extract( $r, EXTR_SKIP );
-    
+
     $file = plugin_basename( $file );
 
@@ -1708 +1710 @@
         $position++;
     } while ( !empty( $menu[$position] ) );
-    
+
     $menu[$position] = array ( $menu_title, $access_level, $file, $page_title, 'menu-top ' . $hookname, $hookname, $icon_url );
 
@@ -1721 +1723 @@
  * When a user logs in, check if they have been marked as a spammer. If then simply
  * redirect them to the home page and stop them from logging in.
- * 
+ *
  * @package BuddyPress Core
  * @param $username The username of the user
@@ -1728 +1730 @@
 function bp_core_boot_spammer( $auth_obj, $username ) {
     global $bp;
-    
+
     $user = get_userdatabylogin( $username );
 
@@ -1740 +1742 @@
  *
  * Deletes usermeta for the user when the user is deleted.
- * 
+ *
  * @package BuddyPress Core
  * @param $user_id The user id for the user to delete usermeta for
@@ -1758 +1760 @@
 /**
  * bp_load_buddypress_textdomain()
- * 
+ *
  * Load the buddypress translation file for current language
- * 
+ *
  * @package BuddyPress Core
  */
@@ -1766 +1768 @@
     $locale = apply_filters( 'buddypress_locale', get_locale() );
     $mofile = BP_PLUGIN_DIR . "/bp-languages/buddypress-$locale.mo";
-    
+
     if ( file_exists( $mofile ) )
         load_textdomain( 'buddypress', $mofile );
@@ -1781 +1783 @@
 /**
  * bp_core_update_message()
- * 
+ *
  * Add an extra update message to the update plugin notification.
- * 
+ *
  * @package BuddyPress Core
  */
@@ -1793 +1795 @@
 /**
  * bp_core_clear_user_object_cache()
- * 
+ *
  * Clears all cached objects for a user, or a user is part of.
- * 
+ *
  * @package BuddyPress Core
  */