Changeset 11252

Timestamp:

11/28/2016 12:07:20 PM (8 years ago)

Author:

djpaul

Message:

xprofile: fix valueless datebox profile fields erroneously returning the unix epoch.

Fixes #7351 (branch 2.7)

Props nickmomrik

Location:

branches/2.7

Files:

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

branches/2.7/src/bp-xprofile/classes/class-bp-xprofile-field-type-datebox.php

@@ -591 +591 @@
      */
     public static function display_filter( $field_value, $field_id = '' ) {
+        if ( ! $field_value ) {
+            return $field_value;
+        }
 
         // If Unix timestamp.

branches/2.7/tests/phpunit/testcases/xprofile/class-bp-xprofile-field.php

@@ -205 +205 @@
         $this->assertEquals( $new_field_order, $updated_fetched_field->field_order );
     }
+
+    /**
+     * @ticket BP7351
+     */
+    public function test_empty_datebox_fields_should_not_return_unix_epoch() {
+        $user  = $this->factory->user->create( array( 'role' => 'subscriber' ) );
+        $group = $this->factory->xprofile_group->create();
+        $field = $this->factory->xprofile_field->create( array(
+            'field_group_id' => $group,
+            'type' => 'datebox',
+        ) );
+
+        $old_user = get_current_user_id();
+        $this->set_current_user( $user );
+
+        $value = bp_get_profile_field_data( array( 'user_id' => $user, 'field' => $field ) );
+        $this->assertEmpty( $value );
+
+        $this->set_current_user( $old_user );
+    }
 }