Skip to:
Content

BuddyPress.org

Ticket #8174: 8174.patch

File 8174.patch, 2.3 KB (added by imath, 5 years ago)

  • src/bp-core/bp-core-filters.php 

    diff --git src/bp-core/bp-core-filters.php src/bp-core/bp-core-filters.php
index 4521b1d58..adc38a5ab 100644
    function bp_core_activation_signup_blog_notification( $domain, $path, $title, $u 
    477477        );
    478478
    479479        $salutation = $user;
    480         if ( $signups ) {
     480        if ( $signups && bp_is_active( 'xprofile' ) ) {
    481481                $signup = $signups['signups'][0];
    482482                if ( isset( $signup->meta[ 'field_' . bp_xprofile_fullname_field_id() ] ) ) {
    483483                        $salutation = $signup->meta[ 'field_' . bp_xprofile_fullname_field_id() ];
    … … function bp_core_activation_signup_user_notification( $user, $user_email, $key, 
    539539        }
    540540
    541541        $salutation = $user;
    542         if ( isset( $meta[ 'field_' . bp_xprofile_fullname_field_id() ] ) ) {
     542        if ( bp_is_active( 'xprofile' ) && isset( $meta[ 'field_' . bp_xprofile_fullname_field_id() ] ) ) {
    543543                $salutation = $meta[ 'field_' . bp_xprofile_fullname_field_id() ];
    544544        } elseif ( $user_id ) {
    545545                $salutation = bp_core_get_user_displayname( $user_id );

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

    diff --git src/bp-members/bp-members-functions.php src/bp-members/bp-members-functions.php
index 7cdcb7ec9..0bbe3d133 100644
    function bp_core_signup_user( $user_login, $user_password, $user_email, $usermet 
    17761776                 */
    17771777                if ( apply_filters( 'bp_core_signup_send_activation_key', true, $user_id, $user_email, $activation_key, $usermeta ) ) {
    17781778                        $salutation = $user_login;
    1779                         if ( isset( $usermeta[ 'field_' . bp_xprofile_fullname_field_id() ] ) ) {
     1779                        if ( bp_is_active( 'xprofile' ) && isset( $usermeta[ 'field_' . bp_xprofile_fullname_field_id() ] ) ) {
    17801780                                $salutation = $usermeta[ 'field_' . bp_xprofile_fullname_field_id() ];
    17811781                        }
    17821782

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

    diff --git src/bp-members/classes/class-bp-signup.php src/bp-members/classes/class-bp-signup.php
index 57fe29124..339e00c2c 100644
    class BP_Signup { 
    640640                                // Send the validation email.
    641641                                } else {
    642642                                        $salutation = $signup->user_login;
    643                                         if ( isset( $meta[ 'field_' . bp_xprofile_fullname_field_id() ] ) ) {
     643                                        if ( bp_is_active( 'xprofile' ) && isset( $meta[ 'field_' . bp_xprofile_fullname_field_id() ] ) ) {
    644644                                                $salutation = $meta[ 'field_' . bp_xprofile_fullname_field_id() ];
    645645                                        }
    646646