Changeset 8137 for trunk/bp-core/bp-core-filters.php

Timestamp:

03/17/2014 07:16:49 PM (11 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:

• trunk/bp-core/bp-core-filters.php (modified) (2 diffs)

trunk/bp-core/bp-core-filters.php

@@ -250 +250 @@
 function bp_core_filter_user_welcome_email( $welcome_email ) {
 
+    // Don't touch the email when a user is registered by the site admin
+    if ( is_admin() )
+        return $welcome_email;
+
     // Don't touch the email if we don't have a custom registration template
     if ( ! bp_has_custom_signup_page() )
@@ -275 +279 @@
  */
 function bp_core_filter_blog_welcome_email( $welcome_email, $blog_id, $user_id, $password ) {
+
+    // Don't touch the email when a user is registered by the site admin.
+    if ( is_admin() )
+        return $welcome_email;
 
     // Don't touch the email if we don't have a custom registration template