Changeset 2822 for trunk/bp-xprofile.php

Timestamp:

03/08/2010 04:20:25 PM (16 years ago)

Author:

apeatling

Message:

Merge 1.2 branch with trunk

File:

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

trunk/bp-xprofile.php

@@ -899 +899 @@
  * @package BuddyPress Core
  */
-function xprofile_sync_wp_profile() {
+function xprofile_sync_wp_profile( $user_id = false ) {
         global $bp, $wpdb;
 
@@ -905 +905 @@
                 return true;
 
-        $fullname = xprofile_get_field_data( BP_XPROFILE_FULLNAME_FIELD_NAME, $bp->loggedin_user->id );
+        if ( empty( $user_id ) )
+                $user_id = $bp->loggedin_user->id;
+
+        if ( empty( $user_id ) )
+                return false;
+
+        $fullname = xprofile_get_field_data( BP_XPROFILE_FULLNAME_FIELD_NAME, $user_id );
         $space = strpos( $fullname, ' ' );
 
@@ -916 +922 @@
         }
 
-        update_usermeta( $bp->loggedin_user->id, 'nickname', $fullname );
-        update_usermeta( $bp->loggedin_user->id, 'first_name', $firstname );
-        update_usermeta( $bp->loggedin_user->id, 'last_name', $lastname );
-
-        $wpdb->query( $wpdb->prepare( "UPDATE {$wpdb->users} SET display_name = %s WHERE ID = %d", $fullname, $bp->loggedin_user->id ) );
-        $wpdb->query( $wpdb->prepare( "UPDATE {$wpdb->users} SET user_url = %s WHERE ID = %d", bp_core_get_user_domain( $bp->loggedin_user->id ), $bp->loggedin_user->id ) );
+        update_usermeta( $user_id, 'nickname', $fullname );
+        update_usermeta( $user_id, 'first_name', $firstname );
+        update_usermeta( $user_id, 'last_name', $lastname );
+
+        $wpdb->query( $wpdb->prepare( "UPDATE {$wpdb->users} SET display_name = %s WHERE ID = %d", $fullname, $user_id ) );
+        $wpdb->query( $wpdb->prepare( "UPDATE {$wpdb->users} SET user_url = %s WHERE ID = %d", bp_core_get_user_domain( $user_id ), $user_id ) );
 }
 add_action( 'xprofile_updated_profile', 'xprofile_sync_wp_profile' );
-
+add_action( 'bp_core_signup_user', 'xprofile_sync_wp_profile' );
 
 /**