Changeset 5961

Timestamp:

04/06/2012 10:44:11 PM (14 years ago)

Author:

djpaul

Message:

Make sure ID property is set in Group object when Group is saved. Fixes #4105, props augustknight

File:

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

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

@@ -45 +45 @@
                 $this->description = apply_filters( 'xprofile_group_description_before_save', $this->description, $this->id );
 
-                do_action_ref_array( 'xprofile_group_before_save', array( $this ) );
-
-                if ( !empty( $this->id ) )
+                do_action_ref_array( 'xprofile_group_before_save', array( &$this ) );
+
+                if ( $this->id )
                         $sql = $wpdb->prepare( "UPDATE {$bp->profile->table_name_groups} SET name = %s, description = %s WHERE id = %d", $this->name, $this->description, $this->id );
                 else
@@ -55 +55 @@
                         return false;
 
-                do_action_ref_array( 'xprofile_group_after_save', array( $this ) );
-
-                if ( !empty( $this->id ) )
-                        return $this->id;
-                else
-                        return $wpdb->insert_id;
+                // If not set, update the ID in the group object
+                if ( ! $this->id )
+                        $this->id = $wpdb->insert_id;
+
+                do_action_ref_array( 'xprofile_group_after_save', array( &$this ) );
+
+                return $this->id;
         }