Changeset 2077 for trunk/bp-xprofile.php

Timestamp:

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

Author:

apeatling

Message:

Merging 1.1 branch changes and syncing.

File:

• trunk/bp-xprofile.php (modified) (78 diffs)

trunk/bp-xprofile.php

@@ -15 +15 @@
 /* Include deprecated functions if settings allow */
 if ( !defined( 'BP_IGNORE_DEPRECATED' ) )
-    require ( BP_PLUGIN_DIR . '/bp-xprofile/deprecated/bp-xprofile-deprecated.php' );   
+    require ( BP_PLUGIN_DIR . '/bp-xprofile/deprecated/bp-xprofile-deprecated.php' );
 
 /* Assign the base group and fullname field names to constants to use in SQL statements */
@@ -25 +25 @@
  *
  * Set up the database tables needed for the xprofile component.
- * 
+ *
  * @package BuddyPress XProfile
  * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
@@ -36 +36 @@
     if ( !empty($wpdb->charset) )
         $charset_collate = "DEFAULT CHARACTER SET $wpdb->charset";
-    
+
     if ( '' == get_site_option( 'bp-xprofile-base-group-name' ) )
         update_site_option( 'bp-xprofile-base-group-name', 'Base' );
-    
+
     if ( '' == get_site_option( 'bp-xprofile-fullname-field-name' ) )
-        update_site_option( 'bp-xprofile-fullname-field-name', 'Name' );    
-    
+        update_site_option( 'bp-xprofile-fullname-field-name', 'Name' );
+
     $sql[] = "CREATE TABLE {$bp->profile->table_name_groups} (
               id bigint(20) unsigned NOT NULL AUTO_INCREMENT PRIMARY KEY,
@@ -50 +50 @@
               KEY can_delete (can_delete)
     ) {$charset_collate};";
-    
+
     $sql[] = "CREATE TABLE {$bp->profile->table_name_fields} (
               id bigint(20) unsigned NOT NULL AUTO_INCREMENT PRIMARY KEY,
@@ -70 +70 @@
               KEY is_required (is_required)
     ) {$charset_collate};";
-    
+
     $sql[] = "CREATE TABLE {$bp->profile->table_name_data} (
               id bigint(20) unsigned NOT NULL AUTO_INCREMENT PRIMARY KEY,
@@ -80 +80 @@
               KEY user_id (user_id)
     ) {$charset_collate};";
-    
+
     if ( '' == get_site_option( 'bp-xprofile-db-version' ) ) {
         $sql[] = "INSERT INTO {$bp->profile->table_name_groups} VALUES ( 1, '" . get_site_option( 'bp-xprofile-base-group-name' ) . "', '', 0 );";
-    
-        $sql[] = "INSERT INTO {$bp->profile->table_name_fields} ( 
+
+        $sql[] = "INSERT INTO {$bp->profile->table_name_fields} (
                     id, group_id, parent_id, type, name, is_required, can_delete
                   ) VALUES (
@@ -90 +90 @@
                   );";
     }
-    
+
     require_once( ABSPATH . 'wp-admin/upgrade-functions.php' );
     dbDelta($sql);
-    
+
     if ( function_exists('bp_wire_install') )
         xprofile_wire_install();
-    
+
     update_site_option( 'bp-xprofile-db-version', BP_XPROFILE_DB_VERSION );
 }
@@ -124 +124 @@
  *
  * Add the profile globals to the $bp global for use across the installation
- * 
+ *
  * @package BuddyPress XProfile
  * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
@@ -132 +132 @@
 function xprofile_setup_globals() {
     global $bp, $wpdb;
-    
+
     /* For internal identification */
     $bp->profile->id = 'profile';
-        
+
     $bp->profile->table_name_groups = $wpdb->base_prefix . 'bp_xprofile_groups';
     $bp->profile->table_name_fields = $wpdb->base_prefix . 'bp_xprofile_fields';
@@ -145 +145 @@
     /* Register this in the active components array */
     $bp->active_components[$bp->profile->slug] = $bp->profile->id;
-    
+
     /* Set the support field type ids */
     $bp->profile->field_types = apply_filters( 'xprofile_field_types', array( 'textbox', 'textarea', 'radio', 'checkbox', 'selectbox', 'multiselectbox', 'datebox' ) );
@@ -151 +151 @@
     if ( function_exists( 'bp_wire_install' ) )
         $bp->profile->table_name_wire = $wpdb->base_prefix . 'bp_xprofile_wire';
-    
+
     do_action( 'xprofile_setup_globals' );
 }
@@ -162 +162 @@
  * Creates the administration interface menus and checks to see if the DB
  * tables are set up.
- * 
+ *
  * @package BuddyPress XProfile
  * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
@@ -171 +171 @@
  * @uses add_submenu_page() Adds a submenu tab to a top level tab in the admin area
  * @uses xprofile_install() Runs the DB table installation function
- * @return 
+ * @return
  */
 function xprofile_add_admin_menu() {
     global $wpdb, $bp;
-    
+
     if ( !is_site_admin() )
         return false;
-            
+
     /* Add the administration tab under the "Site Admin" tab for site administrators */
     add_submenu_page( 'bp-general-settings', __("Profile Field Setup", 'buddypress'), __("Profile Field Setup", 'buddypress'), 'manage-options', 'bp-profile-setup', "xprofile_admin" );
@@ -192 +192 @@
  *
  * Sets up the navigation items for the xprofile component
- * 
+ *
  * @package BuddyPress XProfile
  * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
@@ -203 +203 @@
 function xprofile_setup_nav() {
     global $bp;
-    
+
     /* Add 'Profile' to the main navigation */
     bp_core_new_nav_item( array( 'name' => __( 'Profile', 'buddypress' ), 'slug' => $bp->profile->slug, 'position' => 20, 'screen_function' => 'xprofile_screen_display_profile', 'default_subnav_slug' => 'public', 'item_css_id' => $bp->profile->id ) );
 
     $profile_link = $bp->loggedin_user->domain . $bp->profile->slug . '/';
-    
+
     /* Add the subnav items to the profile */
     bp_core_new_subnav_item( array( 'name' => __( 'Public', 'buddypress' ), 'slug' => 'public', 'parent_url' => $profile_link, 'parent_slug' => $bp->profile->slug, 'screen_function' => 'xprofile_screen_display_profile', 'position' => 10 ) );
@@ -219 +219 @@
         } 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;
         }
     }
-    
+
     do_action( 'xprofile_setup_nav' );
 }
@@ -233 +233 @@
  *
  * Adds an admin bar menu to any profile page providing site admin options for that user.
- * 
+ *
  * @package BuddyPress XProfile
  * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
@@ -239 +239 @@
 function xprofile_setup_adminbar_menu() {
     global $bp;
-    
+
     if ( !$bp->displayed_user->id )
         return false;
-    
+
     /* Don't show this menu to non site admins or if you're viewing your own profile */
     if ( !is_site_admin() || bp_is_home() )
@@ -249 +249 @@
     <li id="bp-adminbar-adminoptions-menu">
         <a href=""><?php _e( 'Admin Options', 'buddypress' ) ?></a>
-        
+
         <ul>
             <li><a href="<?php echo $bp->displayed_user->domain . $bp->profile->slug ?>/edit/"><?php printf( __( "Edit %s's Profile", 'buddypress' ), attribute_escape( $bp->displayed_user->fullname ) ) ?></a></li>
             <li><a href="<?php echo $bp->displayed_user->domain . $bp->profile->slug ?>/change-avatar/"><?php printf( __( "Edit %s's Avatar", 'buddypress' ), attribute_escape( $bp->displayed_user->fullname ) ) ?></a></li>
-            
+
             <?php if ( !bp_core_is_user_spammer( $bp->displayed_user->id ) ) : ?>
                 <li><a href="<?php echo wp_nonce_url( $bp->displayed_user->domain . 'admin/mark-spammer/', 'mark-unmark-spammer' ) ?>" class="confirm"><?php _e( "Mark as Spammer", 'buddypress' ) ?></a></li>
@@ -259 +259 @@
                 <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; ?>
-            
+
             <li><a href="<?php echo wp_nonce_url( $bp->displayed_user->domain . 'admin/delete-user/', 'delete-user' ) ?>" class="confirm"><?php printf( __( "Delete %s", 'buddypress' ), attribute_escape( $bp->displayed_user->fullname ) ) ?></a></li>
-            
+
             <?php do_action( 'xprofile_adminbar_menu_items' ) ?>
         </ul>
@@ -281 +281 @@
  *
  * Handles the display of the profile page by loading the correct template file.
- * 
+ *
  * @package BuddyPress Xprofile
  * @uses bp_core_load_template() Looks for and loads a template file within the current member theme (folder/filename)
@@ -292 +292 @@
     if ( isset($_GET['new']) )
         bp_core_delete_notifications_for_user_by_item_id( $bp->loggedin_user->id, $bp->displayed_user->id, 'friends', 'friendship_accepted' );
-    
+
     do_action( 'xprofile_screen_display_profile', $_GET['new'] );
     bp_core_load_template( apply_filters( 'xprofile_template_display_profile', 'profile/index' ) );
@@ -302 +302 @@
  * Handles the display of the profile edit page by loading the correct template file.
  * Also checks to make sure this can only be accessed for the logged in users profile.
- * 
+ *
  * @package BuddyPress Xprofile
  * @uses bp_is_home() Checks to make sure the current user being viewed equals the logged in user
@@ -309 +309 @@
 function xprofile_screen_edit_profile() {
     global $bp;
-    
+
     if ( !bp_is_home() && !is_site_admin() )
         return false;
-    
+
     /* Check to see if any new information has been submitted */
     if ( isset($_POST['field_ids']) ) {
-        
+
         /* Check the nonce */
         check_admin_referer( 'bp_xprofile_edit' );
-        
+
         /* Check we have field ID's */
         if ( empty( $_POST['field_ids'] ) )
             bp_core_redirect( $bp->displayed_user->domain . BP_XPROFILE_SLUG . '/edit/group/' . $bp->action_variables[1] . '/' );
-        
+
         /* Explode the posted field IDs into an array so we know which fields have been submitted */
         $posted_field_ids = explode( ',', $_POST['field_ids'] );
-                
+
         /* Loop through the posted fields formatting any datebox values then validate the field */
-        foreach ( $posted_field_ids as $field_id ) {        
-
+        foreach ( $posted_field_ids as $field_id ) {
             if ( !isset( $_POST['field_' . $field_id] ) ) {
 
                 if ( is_numeric( $_POST['field_' . $field_id . '_day'] ) ) {
                     /* Concatenate the values. */
-                    $date_value = $_POST['field_' . $field_id . '_day'] . ' ' .  
+                    $date_value = $_POST['field_' . $field_id . '_day'] . ' ' .
                                   $_POST['field_' . $field_id . '_month'] . ' ' .
                                   $_POST['field_' . $field_id . '_year'];
@@ -348 +347 @@
 
         if ( $errors )
-            bp_core_add_message( __( 'Please make sure you fill in all required fields in this profile field group before saving.', 'buddypress' ), 'error' );          
-        else {      
+            bp_core_add_message( __( 'Please make sure you fill in all required fields in this profile field group before saving.', 'buddypress' ), 'error' );
+        else {
             /* Reset the errors var */
             $errors = false;
-        
+
             /* Now we've checked for required fields, lets save the values. */
-            foreach ( $posted_field_ids as $field_id ) {        
+            foreach ( $posted_field_ids as $field_id ) {
                 if ( !xprofile_set_field_data( $field_id, $bp->displayed_user->id, $_POST['field_' . $field_id] ) )
                     $errors = true;
@@ -360 +359 @@
                     do_action( 'xprofile_profile_field_data_updated', $field_id, $_POST['field_' . $field_id] );
             }
-                
+
             do_action( 'xprofile_updated_profile', $posted_field_ids, $errors );
-        
+
             /* Set the feedback messages */
             if ( $errors )
                 bp_core_add_message( __( 'There was a problem updating some of your profile information, please try again.', 'buddypress' ), 'error' );
-            else 
+            else
                 bp_core_add_message( __( 'Changes saved.', 'buddypress' ) );
 
@@ -375 +374 @@
 
     do_action( 'xprofile_screen_edit_profile' );
-    bp_core_load_template( apply_filters( 'xprofile_template_edit_profile', 'profile/edit' ) );         
+    bp_core_load_template( apply_filters( 'xprofile_template_edit_profile', 'profile/edit' ) );
 }
 
@@ -382 +381 @@
  *
  * Handles the uploading and cropping of a user avatar. Displays the change avatar page.
- * 
+ *
  * @package BuddyPress Xprofile
  * @uses bp_is_home() Checks to make sure the current user being viewed equals the logged in user
@@ -389 +388 @@
 function xprofile_screen_change_avatar() {
     global $bp;
-    
+
     if ( !bp_is_home() && !is_site_admin() )
         return false;
-    
+
     $bp->avatar_admin->step = 'upload-image';
-    
+
     if ( !empty( $_FILES ) ) {
-        
+
         /* Check the nonce */
         check_admin_referer( 'bp_avatar_upload' );
 
-        /* Pass the file to the avatar upload handler */        
-        if ( bp_core_avatar_handle_upload( $_FILES, 'xprofile_avatar_upload_dir' ) ) {      
+        /* Pass the file to the avatar upload handler */
+        if ( bp_core_avatar_handle_upload( $_FILES, 'xprofile_avatar_upload_dir' ) ) {
             $bp->avatar_admin->step = 'crop-image';
 
@@ -408 +407 @@
         }
     }
-    
+
     /* If the image cropping is done, crop the image and save a full/thumb version */
     if ( isset( $_POST['avatar-crop-submit'] ) ) {
-        
+
         /* Check the nonce */
         check_admin_referer( 'bp_avatar_cropstore' );
@@ -424 +423 @@
 
     do_action( 'xprofile_screen_change_avatar' );
-    
+
     bp_core_load_template( apply_filters( 'xprofile_template_change_avatar', 'profile/change-avatar' ) );
 }
@@ -434 +433 @@
  * Settings are hooked into the function: bp_core_screen_notification_settings_content()
  * in bp-core/bp-core-settings.php
- * 
+ *
  * @package BuddyPress Xprofile
  * @global $current_user WordPress global variable containing current logged in user information
  */
-function xprofile_screen_notification_settings() { 
+function xprofile_screen_notification_settings() {
     global $current_user; ?>
     <?php if ( function_exists('bp_wire_install') ) { ?>
@@ -455 +454 @@
             <td class="no"><input type="radio" name="notifications[notification_profile_wire_post]" value="no" <?php if ( 'no' == get_usermeta( $current_user->id, 'notification_profile_wire_post' ) ) { ?>checked="checked" <?php } ?>/></td>
         </tr>
-        
+
         <?php do_action( 'xprofile_screen_notification_settings' ) ?>
     </table>
     <?php } ?>
-<?php   
+<?php
 }
 add_action( 'bp_notification_settings', 'xprofile_screen_notification_settings', 1 );
@@ -479 +478 @@
  *
  * The function will delete the active avatar for a user.
- * 
+ *
  * @package BuddyPress Xprofile
  * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
@@ -491 +490 @@
     if ( $bp->profile->slug != $bp->current_component || 'change-avatar' != $bp->current_action || 'delete-avatar' != $bp->action_variables[0] )
         return false;
-    
+
     /* Check the nonce */
     check_admin_referer( 'bp_delete_avatar_link' );
-    
+
     if ( !bp_is_home() && !is_site_admin() )
         return false;
-    
+
     if ( bp_core_delete_existing_avatar( array( 'item_id' => $bp->displayed_user->id ) ) )
         bp_core_add_message( __( 'Your avatar was deleted successfully!', 'buddypress' ) );
@@ -503 +502 @@
         bp_core_add_message( __( 'There was a problem deleting that avatar, please try again.', 'buddypress' ), 'error' );
 
-    bp_core_redirect( wp_get_referer() ); 
+    bp_core_redirect( wp_get_referer() );
 }
 add_action( 'wp', 'xprofile_action_delete_avatar', 3 );
@@ -510 +509 @@
  * xprofile_action_new_wire_post()
  *
- * Posts a new wire post to the users profile wire. 
- * 
+ * Posts a new wire post to the users profile wire.
+ *
  * @package BuddyPress XProfile
  * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
@@ -523 +522 @@
     if ( $bp->current_component != $bp->wire->slug )
         return false;
-    
+
     if ( 'post' != $bp->current_action )
         return false;
-        
+
     /* Check the nonce */
-    if ( !check_admin_referer( 'bp_wire_post' ) ) 
-        return false;
-        
+    if ( !check_admin_referer( 'bp_wire_post' ) )
+        return false;
+
     if ( !$wire_post = bp_wire_new_post( $bp->displayed_user->id, $_POST['wire-post-textarea'], $bp->profile->slug, false, $bp->profile->table_name_wire ) ) {
         bp_core_add_message( __( 'Wire message could not be posted. Please try again.', 'buddypress' ), 'error' );
     } else {
         bp_core_add_message( __( 'Wire message successfully posted.', 'buddypress' ) );
-        
+
         /* Record the notification for the reciever if it's not on their own wire */
         if ( !bp_is_home() )
-            bp_core_add_notification( $bp->loggedin_user->id, $bp->displayed_user->id, $bp->profile->id, 'new_wire_post' ); 
-        
+            bp_core_add_notification( $bp->loggedin_user->id, $bp->displayed_user->id, $bp->profile->id, 'new_wire_post' );
+
         /* Record this on the poster's activity screen */
         if ( ( $wire_post->item_id == $bp->loggedin_user->id && $wire_post->user_id == $bp->loggedin_user->id ) || ( $wire_post->item_id == $bp->displayed_user->id && $wire_post->user_id == $bp->displayed_user->id ) ) {
             $from_user_link = bp_core_get_userlink($wire_post->user_id);
-            $content = sprintf( __('%s wrote on their own wire', 'buddypress'), $from_user_link ) . ': <span class="time-since">%s</span>';             
-            $primary_link = bp_core_get_userlink( $wire_post->user_id, false, true );   
+            $content = sprintf( __('%s wrote on their own wire', 'buddypress'), $from_user_link ) . ': <span class="time-since">%s</span>';
+            $primary_link = bp_core_get_userlink( $wire_post->user_id, false, true );
         } else if ( ( $wire_post->item_id != $bp->loggedin_user->id && $wire_post->user_id == $bp->loggedin_user->id ) || ( $wire_post->item_id != $bp->displayed_user->id && $wire_post->user_id == $bp->displayed_user->id ) ) {
             $from_user_link = bp_core_get_userlink($wire_post->user_id);
             $to_user_link = bp_core_get_userlink( $wire_post->item_id, false, false, true, true );
-            $content = sprintf( __('%s wrote on %s wire', 'buddypress'), $from_user_link, $to_user_link ) . ': <span class="time-since">%s</span>';         
+            $content = sprintf( __('%s wrote on %s wire', 'buddypress'), $from_user_link, $to_user_link ) . ': <span class="time-since">%s</span>';
             $primary_link = bp_core_get_userlink( $wire_post->item_id, false, true );
-        } 
-        
+        }
+
         $content .= '<blockquote>' . bp_create_excerpt($wire_post->content) . '</blockquote>';
 
@@ -563 +562 @@
         ) );
 
-        do_action( 'xprofile_new_wire_post', &$wire_post ); 
+        do_action( 'xprofile_new_wire_post', &$wire_post );
     }
 
@@ -577 +576 @@
  * xprofile_action_delete_wire_post()
  *
- * Deletes a wire post from the users profile wire. 
- * 
+ * Deletes a wire post from the users profile wire.
+ *
  * @package BuddyPress XProfile
  * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
@@ -588 +587 @@
 function xprofile_action_delete_wire_post() {
     global $bp;
-    
+
     if ( $bp->current_component != $bp->wire->slug )
         return false;
-    
+
     if ( $bp->current_action != 'delete' )
         return false;
-    
+
     if ( !check_admin_referer( 'bp_wire_delete_link' ) )
         return false;
-            
+
     $wire_post_id = $bp->action_variables[0];
 
@@ -605 +604 @@
         /* Delete the post from activity streams */
         xprofile_delete_activity( array( 'item_id' => $wire_post_id, 'component_action' => 'new_wire_post' ) );
-        
-        do_action( 'xprofile_delete_wire_post', $wire_post_id );                        
+
+        do_action( 'xprofile_delete_wire_post', $wire_post_id );
     } else {
         bp_core_add_message( __('Wire post could not be deleted, please try again.', 'buddypress'), 'error' );
     }
-    
+
     if ( !strpos( wp_get_referer(), $bp->wire->slug ) ) {
         bp_core_redirect( $bp->displayed_user->domain );
@@ -629 +628 @@
 function xprofile_register_activity_actions() {
     global $bp;
-    
+
     if ( !function_exists( 'bp_activity_set_action' ) )
         return false;
@@ -647 +646 @@
  * Records activity for the logged in user within the profile component so that
  * it will show in the users activity stream (if installed)
- * 
+ *
  * @package BuddyPress XProfile
  * @param $args Array containing all variables used after extract() call
@@ -655 +654 @@
 function xprofile_record_activity( $args = true ) {
     global $bp;
-    
+
     if ( !function_exists( 'bp_activity_add' ) )
         return false;
@@ -672 +671 @@
 
     $r = wp_parse_args( $args, $defaults );
-    extract( $r, EXTR_SKIP );   
-    
+    extract( $r, EXTR_SKIP );
+
     return bp_activity_add( array( 'user_id' => $user_id, 'content' => $content, 'primary_link' => $primary_link, 'component_name' => $component_name, 'component_action' => $component_action, 'item_id' => $item_id, 'secondary_item_id' => $secondary_item_id, 'recorded_time' => $recorded_time, 'hide_sitewide' => $hide_sitewide ) );
 }
@@ -682 +681 @@
  * Deletes activity for a user within the profile component so that
  * it will be removed from the users activity stream and sitewide stream (if installed)
- * 
+ *
  * @package BuddyPress XProfile
  * @param $args Array containing all variables used after extract() call
@@ -690 +689 @@
 function xprofile_delete_activity( $args = '' ) {
     global $bp;
-    
+
     if ( function_exists('bp_activity_delete_by_item_id') ) {
         extract($args);
@@ -699 +698 @@
 function xprofile_register_activity_action( $key, $value ) {
     global $bp;
-    
+
     if ( !function_exists( 'bp_activity_set_action' ) )
         return false;
-    
+
     return apply_filters( 'xprofile_register_activity_action', bp_activity_set_action( $bp->profile->id, $key, $value ), $key, $value );
 }
@@ -710 +709 @@
  *
  * Format notifications into something that can be read and displayed
- * 
+ *
  * @package BuddyPress Xprofile
  * @param $item_id The ID of the specific item for which the activity is recorded (could be a wire post id, user id etc)
@@ -724 +723 @@
     if ( 'new_wire_post' == $action ) {
         if ( (int)$total_items > 1 ) {
-            return apply_filters( 'bp_xprofile_multiple_new_wire_post_notification', '<a href="' . $bp->loggedin_user->domain . $bp->wire->slug . '" title="' . __( 'Wire', 'buddypress' ) . '">' . sprintf( __( 'You have %d new posts on your wire', 'buddypress' ), (int)$total_items ) . '</a>', $total_items );        
+            return apply_filters( 'bp_xprofile_multiple_new_wire_post_notification', '<a href="' . $bp->loggedin_user->domain . $bp->wire->slug . '" title="' . __( 'Wire', 'buddypress' ) . '">' . sprintf( __( 'You have %d new posts on your wire', 'buddypress' ), (int)$total_items ) . '</a>', $total_items );
         } else {
             $user_fullname = bp_core_get_user_displayname( $item_id );
@@ -730 +729 @@
         }
     }
-    
+
     do_action( 'xprofile_format_notifications', $action, $item_id, $secondary_item_id, $total_items );
-    
+
     return false;
 }
@@ -758 +757 @@
 
     $r = wp_parse_args( $args, $defaults );
-    extract( $r, EXTR_SKIP );   
+    extract( $r, EXTR_SKIP );
 
     if ( !$name )
         return false;
-        
+
     $field_group = new BP_XProfile_Group( $field_group_id );
     $field_group->name = $name;
     $field_group->description = $description;
     $field_group->can_delete = $can_delete;
-    
+
     return $field_group->save();
 }
@@ -785 +784 @@
 function xprofile_insert_field( $args = '' ) {
     global $bp;
-    
+
     extract( $args );
-    
+
     /**
      * Possible parameters (pass as assoc array):
@@ -803 +802 @@
      *  'option_order'
      */
-    
+
     /* Check we have the minimum details */
     if ( !$field_group_id )
         return false;
-    
+
     /* Check this is a valid field type */
     if ( !in_array( $type, (array) $bp->profile->field_types ) )
         return false;
-    
+
     /* Instantiate a new field object */
     if ( $field_id )
@@ -819 +818 @@
 
     $field->group_id = $field_group_id;
-    
+
     if ( !empty( $parent_id ) )
         $field->parent_id = $parent_id;
-    
+
     if ( !empty( $type ) )
         $field->type = $type;
-    
+
     if ( !empty( $name ) )
         $field->name = $name;
@@ -831 +830 @@
     if ( !empty( $description ) )
         $field->description = $description;
-    
+
     if ( !empty( $is_required ) )
         $field->is_required = $is_required;
-        
+
     if ( !empty( $can_delete ) )
         $field->can_delete = $can_delete;
-    
+
     if ( !empty( $field_order ) )
         $field->field_order = $field_order;
-    
+
     if ( !empty( $order_by ) )
         $field->order_by = $order_by;
-    
+
     if ( !empty( $is_default_option ) )
         $field->is_default_option = $is_default_option;
-    
+
     if ( !empty( $option_order ) )
         $field->option_order = $option_order;
-    
+
     if ( !$field->save() )
         return false;
@@ -872 +871 @@
  *
  * Fetches profile data for a specific field for the user.
- * 
+ *
  * @package BuddyPress Core
  * @param $field The ID of the field, or the $name of the field.
@@ -882 +881 @@
 function xprofile_get_field_data( $field, $user_id = null ) {
     global $bp;
-    
+
     if ( !$user_id )
         $user_id = $bp->displayed_user->id;
-    
+
     if ( !$user_id )
         return false;
@@ -904 +903 @@
  *
  * A simple function to set profile data for a specific field for a specific user.
- * 
+ *
  * @package BuddyPress Core
  * @param $field The ID of the field, or the $name of the field.
@@ -918 +917 @@
     else
         $field_id = xprofile_get_field_id_from_name( $field );
-    
+
     if ( !$field_id )
         return false;
-    
+
     $field = new BP_XProfile_ProfileData();
     $field->field_id = $field_id;
     $field->user_id = $user_id;
     $field->value = maybe_serialize( $value );
-    
+
     return $field->save();
 }
@@ -935 +934 @@
     else
         $field_id = xprofile_get_field_id_from_name( $field );
-    
+
     if ( !$field_id )
         return false;
-    
+
     $field = new BP_XProfile_ProfileData( $field_id );
     return $field->delete();
@@ -945 +944 @@
 function xprofile_check_is_required_field( $field_id ) {
     $field = new BP_Xprofile_Field( $field_id );
-    
+
     if ( (int)$field->is_required )
         return true;
-    
+
     return false;
 }
@@ -956 +955 @@
  *
  * Returns the ID for the field based on the field name.
- * 
+ *
  * @package BuddyPress Core
  * @param $field_name The name of the field to get the ID for.
@@ -969 +968 @@
  *
  * Fetches a random piece of profile data for the user.
- * 
+ *
  * @package BuddyPress Core
  * @param $user_id User ID of the user to get random data for
@@ -982 +981 @@
     $field_data = BP_XProfile_ProfileData::get_random( $user_id, $exclude_fullname );
     $field_data[0]->value = xprofile_format_profile_field( $field_data[0]->type, $field_data[0]->value );
-    
+
     if ( !$field_data[0]->value || empty( $field_data[0]->value ) )
         return false;
-    
+
     return apply_filters( 'xprofile_get_random_profile_data', $field_data );
 }
@@ -993 +992 @@
  *
  * Formats a profile field according to its type. [ TODO: Should really be moved to filters ]
- * 
+ *
  * @package BuddyPress Core
  * @param $field_type The type of field: datebox, selectbox, textbox etc
@@ -1003 +1002 @@
     if ( !isset($field_value) || empty( $field_value ) )
         return false;
-        
+
     $field_value = bp_unserialize_profile_field( $field_value );
-        
+
     if ( 'datebox' == $field_type ) {
         $field_value = bp_format_time( $field_value, true );
@@ -1013 +1012 @@
         $field_value = str_replace(']]>', ']]&gt;', $content);
     }
-    
+
     return stripslashes( stripslashes( $field_value ) );
 }
@@ -1025 +1024 @@
  *
  * Setup the avatar upload directory for a user.
- * 
+ *
  * @package BuddyPress Core
  * @param $directory The root directory name
@@ -1036 +1035 @@
     if ( !$user_id )
         $user_id = $bp->displayed_user->id;
-    
+
     if ( !$directory )
         $directory = 'avatars';
@@ -1045 +1044 @@
 
     $newbdir = $newdir;
-    
+
     if ( !file_exists( $newdir ) )
         @wp_mkdir_p( $newdir );
@@ -1060 +1059 @@
  *
  * Syncs Xprofile data to the standard built in WordPress profile data.
- * 
+ *
  * @package BuddyPress Core
  */
 function xprofile_sync_wp_profile() {
     global $bp, $wpdb;
-    
+
     if ( (int)get_site_option( 'bp-disable-profile-sync' ) )
         return true;
-    
+
     $fullname = xprofile_get_field_data( BP_XPROFILE_FULLNAME_FIELD_NAME, $bp->loggedin_user->id );
     $space = strpos( $fullname, ' ' );
-    
+
     if ( false === $space ) {
         $firstname = $fullname;
@@ -1077 +1076 @@
     } else {
         $firstname = substr( $fullname, 0, $space );
-        $lastname = trim( substr( $fullname, $space, strlen($fullname) ) );     
-    }
-    
+        $lastname = trim( substr( $fullname, $space, strlen($fullname) ) );
+    }
+
     update_usermeta( $bp->loggedin_user->id, 'nickname', $fullname );
     update_usermeta( $bp->loggedin_user->id, 'first_name', $firstname );
@@ -1095 +1094 @@
  * Removes notifications from the notification menu when a user clicks on them and
  * is taken to a specific screen.
- * 
+ *
  * @package BuddyPress Core
  */
 function xprofile_remove_screen_notifications() {
     global $bp;
-    
+
     bp_core_delete_notifications_for_user_by_type( $bp->loggedin_user->id, $bp->profile->id, 'new_wire_post' );
 }
@@ -1111 +1110 @@
  * profile data from each table. Also we need to clean anything up in the usermeta table
  * that this component uses.
- * 
+ *
  * @package BuddyPress XProfile
  * @param $user_id The ID of the deleted user
@@ -1120 +1119 @@
 function xprofile_remove_data( $user_id ) {
     BP_XProfile_ProfileData::delete_data_for_user( $user_id );
-    
+
     // delete any avatar files.
     @unlink( get_usermeta( $user_id, 'bp_core_avatar_v1_path' ) );
     @unlink( get_usermeta( $user_id, 'bp_core_avatar_v2_path' ) );
-    
+
     // unset the usermeta for avatars from the usermeta table.
     delete_usermeta( $user_id, 'bp_core_avatar_v1' );
@@ -1144 +1143 @@
 
 function xprofile_clear_profile_data_object_cache( $group_id ) {
-    global $bp; 
+    global $bp;
     wp_cache_delete( 'xprofile_fields_' . $group_id . '_' . $bp->loggedin_user->id, 'bp' );
     wp_cache_delete( 'bp_user_fullname_' . $bp->loggedin_user->id, 'bp' );