Changeset 9986

Timestamp:

07/02/2015 01:25:25 PM (9 years ago)

Author:

boonebgorges

Message:

Better setting of id property in BP_XProfile_Field::save().

This ensures that the property is set before the after_save hook is fired.

Props Offereins.
Fixes #6545.

File:

• trunk/src/bp-xprofile/classes/class-bp-xprofile-field.php (modified) (4 diffs)

trunk/src/bp-xprofile/classes/class-bp-xprofile-field.php

@@ -276 +276 @@
         do_action_ref_array( 'xprofile_field_before_save', array( $this ) );
 
-        if ( $this->id != null ) {
+        $is_new_field = is_null( $this->id );
+
+        if ( ! $is_new_field ) {
             $sql = $wpdb->prepare( "UPDATE {$bp->profile->table_name_fields} SET group_id = %d, parent_id = 0, type = %s, name = %s, description = %s, is_required = %d, order_by = %s, field_order = %d, option_order = %d, can_delete = %d, is_default_option = %d WHERE id = %d", $this->group_id, $this->type, $this->name, $this->description, $this->is_required, $this->order_by, $this->field_order, $this->option_order, $this->can_delete, $this->is_default_option, $this->id );
         } else {
@@ -288 +290 @@
         if ( $wpdb->query( $sql ) !== null ) {
 
-            if ( ! empty( $this->id ) ) {
-                $field_id = $this->id;
-            } else {
-                $field_id = $wpdb->insert_id;
+            if ( $is_new_field ) {
+                $this->id = $wpdb->insert_id;
             }
 
             // Only do this if we are editing an existing field
-            if ( $this->id != null ) {
+            if ( ! $is_new_field ) {
 
                 /**
@@ -312 +312 @@
             if ( $this->type_obj->supports_options ) {
 
-                if ( !empty( $this->id ) ) {
-                    $parent_id = $this->id;
-                } else {
-                    $parent_id = $wpdb->insert_id;
-                }
+                $parent_id = $this->id;
 
                 // Allow plugins to filter the field's child options (i.e. the items in a selectbox).
@@ -381 +377 @@
             $this->type_obj            = bp_xprofile_create_field_type( $this->type );
             $this->type_obj->field_obj = $this;
-
-            // If this is a new field, set the `id` property of the current object.
-            if ( empty( $this->id ) ) {
-                $this->id = $field_id;
-            }
 
             return $this->id;