Changeset 12504

Timestamp:

12/06/2019 07:19:44 PM (5 years ago)

Author:

imath

Message:

Make sure users can register when the xProfile component is not active

In version 5.0.0, we've introduced an improvement to use the display name as the salutation in signup emails (see [12349]). To do so we rely on an xProfile's component function. When this component is not active, the function is also not available causing a fatal error and preventing the activation email to be sent. To fix this issue we are now checking the component is active before using the function to return the display name.

Fixes #8174 (Branch 5.0)

Location:

branches/5.0/src

Files:

• bp-core/bp-core-filters.php (modified) (2 diffs)
• bp-members/bp-members-functions.php (modified) (1 diff)
• bp-members/classes/class-bp-signup.php (modified) (1 diff)

branches/5.0/src/bp-core/bp-core-filters.php

@@ -478 +478 @@
 
     $salutation = $user;
-    if ( $signups ) {
+    if ( $signups && bp_is_active( 'xprofile' ) ) {
         $signup = $signups['signups'][0];
         if ( isset( $signup->meta[ 'field_' . bp_xprofile_fullname_field_id() ] ) ) {
@@ -540 +540 @@
 
     $salutation = $user;
-    if ( isset( $meta[ 'field_' . bp_xprofile_fullname_field_id() ] ) ) {
+    if ( bp_is_active( 'xprofile' ) && isset( $meta[ 'field_' . bp_xprofile_fullname_field_id() ] ) ) {
         $salutation = $meta[ 'field_' . bp_xprofile_fullname_field_id() ];
     } elseif ( $user_id ) {

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

@@ -1777 +1777 @@
         if ( apply_filters( 'bp_core_signup_send_activation_key', true, $user_id, $user_email, $activation_key, $usermeta ) ) {
             $salutation = $user_login;
-            if ( isset( $usermeta[ 'field_' . bp_xprofile_fullname_field_id() ] ) ) {
+            if ( bp_is_active( 'xprofile' ) && isset( $usermeta[ 'field_' . bp_xprofile_fullname_field_id() ] ) ) {
                 $salutation = $usermeta[ 'field_' . bp_xprofile_fullname_field_id() ];
             }

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

@@ -641 +641 @@
                 } else {
                     $salutation = $signup->user_login;
-                    if ( isset( $meta[ 'field_' . bp_xprofile_fullname_field_id() ] ) ) {
+                    if ( bp_is_active( 'xprofile' ) && isset( $meta[ 'field_' . bp_xprofile_fullname_field_id() ] ) ) {
                         $salutation = $meta[ 'field_' . bp_xprofile_fullname_field_id() ];
                     }