Changeset 11629 for branches/2.8/src/bp-members/bp-members-functions.php

Timestamp:

07/07/2017 06:37:55 PM (8 years ago)

Author:

r-a-y

Message:

Activation: Ensure we use the XProfile field's default visibility level during activation.

Previously, if the visibility option for a XProfile field was removed from
the registration template, the visibility level for the user would always
fallback to 'public' instead of what the actual XProfile field's default
visibility level was.

Commit includes a unit test and rectifies the problem.

Props uscore713.

Fixes #7553 (2.8-branch)

File:

• branches/2.8/src/bp-members/bp-members-functions.php (modified) (1 diff)

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

@@ -2064 +2064 @@
                 }
 
-                // 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 );
             }