Changeset 9983

Timestamp:

07/02/2015 12:13:10 PM (9 years ago)

Author:

boonebgorges

Message:

Set the id property of a new BP_XProfile_Field object during the save() method.

Props Offereins.
Fixes #6545.

Location:

trunk

Files:

• src/bp-xprofile/classes/class-bp-xprofile-field.php (modified) (2 diffs)
• tests/phpunit/testcases/xprofile/class-bp-xprofile-field.php (modified) (1 diff)

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

@@ -288 +288 @@
         if ( $wpdb->query( $sql ) !== null ) {
 
-            if ( !empty( $this->id ) ) {
+            if ( ! empty( $this->id ) ) {
                 $field_id = $this->id;
             } else {
@@ -382 +382 @@
             $this->type_obj->field_obj = $this;
 
-            return $field_id;
+            // 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;
         } else {
             return false;

trunk/tests/phpunit/testcases/xprofile/class-bp-xprofile-field.php

@@ -109 +109 @@
         );
     }
+
+    /**
+     * @ticket BP6545
+     */
+    public function test_newly_created_field_should_have_field_id_property_set() {
+        $field = new BP_XProfile_Field();
+        $field->group_id = 1;
+        $field->name = 'Foo';
+
+        $new_field_id = $field->save();
+
+        $this->assertSame( $new_field_id, $field->id );
+    }
 }