Changeset 11629

Timestamp:

07/07/2017 06:37:55 PM (7 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)

Location:

branches/2.8

Files:

• src/bp-members/bp-members-functions.php (modified) (1 diff)
• src/bp-members/classes/class-bp-signup.php (modified) (1 diff)
• tests/phpunit/testcases/members/class-bp-signup.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 );
             }

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

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

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

@@ -63 +63 @@
 
     /**
+     * @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
      */