Changeset 1293

Timestamp:

04/01/2009 07:31:34 PM (17 years ago)

Author:

apeatling

Message:

fixed profile data deletion bug

Location:

trunk

Files:

• bp-groups.php (modified) (3 diffs)
• bp-xprofile.php (modified) (1 diff)
• bp-xprofile/bp-xprofile-classes.php (modified) (2 diffs)

trunk/bp-groups.php

@@ -26 +26 @@
 require ( 'bp-groups/bp-groups-widgets.php' );
 require ( 'bp-groups/bp-groups-filters.php' );
+
+
 
 /**************************************************************************
@@ -132 +134 @@
         if ( !$no_global )
                 global $bp;
+                
+        
         
         $bp->groups->table_name = $wpdb->base_prefix . 'bp_groups';
@@ -1094 +1098 @@
                                 
                                 $content = apply_filters( 'bp_groups_new_forum_topic_activity', $content, $user_link, $group_link, $forum_topic['topic_id'], $forum_topic['topic_title'], $group_link, $group->name, $post_content );
-
+                                
                                 return array( 
                                         'primary_link' => $group_link,

trunk/bp-xprofile.php

@@ -675 +675 @@
                                                         
                                                         // Create a new profile data object for the logged in user based on field ID.                                                           
-                                                        $profile_data = new BP_Xprofile_ProfileData( $group->fields[$j]->id );
+                                                        $profile_data = new BP_Xprofile_ProfileData( $group->fields[$j]->id, $bp->loggedin_user->id );
                                                         
-                                                        // Delete any data
-                                                        $profile_data->delete();
+                                                        if ( $profile_data ) {                                  
+                                                                // Delete any data
+                                                                $profile_data->delete();
+                                                                
+                                                                // Also remove any selected profile field data from the $field object.
+                                                                $field->data->value = null;
+                                                        }
                                                         
-                                                        // Also remove any selected profile field data from the $field object.
-                                                        $field->data->value = null;
-                                                
                                                 // If we get to this point then the field validates ok and we have new data.
                                                 } else {

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

@@ -999 +999 @@
                 
                 $sql = $wpdb->prepare( "SELECT * FROM {$bp->profile->table_name_data} WHERE field_id = %d AND user_id = %d", $field_id, $user_id );
-
+                
                 if ( $profiledata = $wpdb->get_row($sql) ) {
+                        
                         $this->id = $profiledata->id;
                         $this->user_id = $profiledata->user_id;
@@ -1061 +1062 @@
                 global $wpdb, $bp;
                 
+                var_dump($wpdb->prepare( "DELETE FROM {$bp->profile->table_name_data} WHERE field_id = %d AND user_id = %d", $this->field_id, $this->user_id ));
+                
                 if ( !$wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->profile->table_name_data} WHERE field_id = %d AND user_id = %d", $this->field_id, $this->user_id ) ) )
                         return false;