Changeset 3232 for trunk/bp-xprofile.php

Timestamp:

09/06/2010 04:24:57 PM (14 years ago)

Author:

apeatling

Message:

Merging 1.2 branch with trunk

File:

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

trunk/bp-xprofile.php

@@ -16 +16 @@
  * @uses site_url() Returns the site URL
  */
+
 function xprofile_setup_globals() {
     global $bp, $wpdb;
@@ -136 +137 @@
             <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>
 <?php else : ?>
@@ -235 +235 @@
         }
 
-        if ( !empty( $errors ) )
+        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 {
@@ -249 +249 @@
             }
 
-            do_action( 'xprofile_updated_profile', $bp->displayed_user->id, $posted_field_ids, $errors );
+            do_action( 'xprofile_updated_profile', $posted_field_ids, $errors );
 
             /* Set the feedback messages */
@@ -642 +642 @@
         return false;
 
-    /* If the value is empty, then delete any field data that exists */
-    if ( empty( $value ) ) {
-        xprofile_delete_field_data( $field_id, $user_id );
-        return true;
-    }
-
     $field = new BP_XProfile_Field( $field_id );
 
@@ -693 +687 @@
         $field_id = xprofile_get_field_id_from_name( $field );
 
-    if ( empty( $field_id ) || empty( $user_id ) )
-        return false;
-
-    $field = new BP_XProfile_ProfileData( $field_id, $user_id );
+    if ( !$field_id )
+        return false;
+
+    $field = new BP_XProfile_ProfileData( $field_id );
     return $field->delete();
 }
@@ -882 +876 @@
     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' );
-    delete_usermeta( $user_id, 'bp_core_avatar_v1_path' );
-    delete_usermeta( $user_id, 'bp_core_avatar_v2' );
-    delete_usermeta( $user_id, 'bp_core_avatar_v2_path' );
+    // delete any avatar files.
+    @unlink( get_user_meta( $user_id, 'bp_core_avatar_v1_path', true ) );
+    @unlink( get_user_meta( $user_id, 'bp_core_avatar_v2_path', true ) );
+
+    // unset the usermeta for avatars from the usermeta table.
+    delete_user_meta( $user_id, 'bp_core_avatar_v1' );
+    delete_user_meta( $user_id, 'bp_core_avatar_v1_path' );
+    delete_user_meta( $user_id, 'bp_core_avatar_v2' );
+    delete_user_meta( $user_id, 'bp_core_avatar_v2_path' );
 }
 add_action( 'wpmu_delete_user', 'xprofile_remove_data' );