Ticket #7553: 7553.01.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 );
                                 }
                         }