Skip to:
Content

BuddyPress.org

Changeset 8137


Ignore:
Timestamp:
03/17/2014 07:16:49 PM (10 years ago)
Author:
boonebgorges
Message:

Don't swap '[User Set]' into welcome emails when accounts are created in the Dashboard

This is incorrect behavior, because when the emails are created when is_admin(),
the password is not set by the user.

The is_admin() exception was mistakenly removed in r6439.

Fixes #5466

Props SergeyBiryukov

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/bp-core/bp-core-filters.php

    r8090 r8137  
    250250function bp_core_filter_user_welcome_email( $welcome_email ) {
    251251
     252    // Don't touch the email when a user is registered by the site admin
     253    if ( is_admin() )
     254        return $welcome_email;
     255
    252256    // Don't touch the email if we don't have a custom registration template
    253257    if ( ! bp_has_custom_signup_page() )
     
    275279 */
    276280function bp_core_filter_blog_welcome_email( $welcome_email, $blog_id, $user_id, $password ) {
     281
     282    // Don't touch the email when a user is registered by the site admin.
     283    if ( is_admin() )
     284        return $welcome_email;
    277285
    278286    // Don't touch the email if we don't have a custom registration template
Note: See TracChangeset for help on using the changeset viewer.