Ticket #7553: 7553.02.patch

src/bp-members/bp-members-functions.php

@@ -2072 +2072 @@
                                         xprofile_set_field_data( $field_id, $user_id, $current_field );
                                 }
 
-                                // Save the visibility level.
-                                $visibility_level = ! empty( $user['meta']['field_' . $field_id . '_visibility'] ) ? $user['meta']['field_' . $field_id . '_visibility'] : 'public';
+                                /*
+                                 * Save the visibility level.
+                                 *
+                                 * Use the field's default visibility if not present, and 'public' if a
+                                 * default visibility is not defined.
+                                 */
+                                $key = "field_{$field_id}_visibility";
+                                if ( isset( $user['meta'][ $key ] ) ) {
+                                        $visibility_level = $user['meta'][ $key ];
+                                } else {
+                                        $vfield           = xprofile_get_field( $field_id );
+                                        $visibility_level = isset( $vfield->default_visibility ) ? $vfield->default_visibility : 'public';
+                                }
                                 xprofile_set_field_visibility_level( $field_id, $user_id, $visibility_level );
                         }
                 }

src/bp-members/classes/class-bp-signup.php

@@ -388 +388 @@
                                         $current_field = $usermeta["field_{$field_id}"];
                                         xprofile_set_field_data( $field_id, $user_id, $current_field );
 
-                                        // Save the visibility level.
-                                        $visibility_level = ! empty( $usermeta['field_' . $field_id . '_visibility'] ) ? $usermeta['field_' . $field_id . '_visibility'] : 'public';
+                                        /*
+                                         * Save the visibility level.
+                                         *
+                                         * Use the field's default visibility if not present, and 'public' if a
+                                         * default visibility is not defined.
+                                         */
+                                        $key = "field_{$field_id}_visibility";
+                                        if ( isset( $usermeta[ $key ] ) ) {
+                                                $visibility_level = $usermeta[ $key ];
+                                        } else {
+                                                $vfield           = xprofile_get_field( $field_id );
+                                                $visibility_level = isset( $vfield->default_visibility ) ? $vfield->default_visibility : 'public';
+                                        }
                                         xprofile_set_field_visibility_level( $field_id, $user_id, $visibility_level );
                                 }
                         }

tests/phpunit/testcases/members/class-bp-signup.php

@@ -62 +62 @@
         }
 
         /**
+         * @group add
+         */
+        public function test_add_no_visibility_level_set_should_use_default_visiblity_level() {
+                // Update field_1's default visiblity to 'adminsonly'
+                bp_xprofile_update_field_meta( 1, 'default_visibility', 'adminsonly' );
+
+                // Add new signup without a custom field visibility set for field_1.
+                $signup = BP_Signup::add( array(
+                        'domain' => 'foo',
+                        'path' => 'bar',
+                        'title' => 'Foo bar',
+                        'user_login' => 'user1',
+                        'user_email' => 'user1@example.com',
+                        'registered' => bp_core_current_time(),
+                        'activation_key' => '12345',
+                        'meta' => array(
+                                'field_1' => 'Foo Bar',
+                                'meta1' => 'meta2',
+                                'password' => 'password',
+
+                                /*
+                                 * Ensure we pass the field ID.
+                                 *
+                                 * See bp_core_activate_signup() and BP_Signup::add_backcompat().
+                                 */
+                                'profile_field_ids' => '1'
+                        ),
+                ) );
+
+                // Activate the signup.
+                $activate = BP_Signup::activate( (array) $signup );
+
+                // Assert that field 1's visibility for the signup is still 'adminsonly'
+                $vis = xprofile_get_field_visibility_level( 1, $activate['activated'][0] );
+                $this->assertSame( 'adminsonly', $vis );
+        }
+
+        /**
          * @group get
          */
         public function test_get_with_offset() {