Changeset 6049

Timestamp:

05/27/2012 04:25:29 PM (12 years ago)

Author:

boonebgorges

Message:

On WP Single, always generate activation key

When 'bp_core_signup_send_activation_key' is filtered to false, an activation
key should still be generated, otherwise the newly created user will be unable
to activate her account. This changeset ensures that the activation key is
generated, even if a plugin is preventing the key from being sent via email.

Fixes #4218

File:

• trunk/bp-members/bp-members-functions.php (modified) (1 diff)

trunk/bp-members/bp-members-functions.php

@@ -1097 +1097 @@
 
     /***
-     * Now generate an activation key and send an email to the user so they can activate their account
-     * and validate their email address. Multisite installs send their own email, so this is only for single blog installs.
+     * Now generate an activation key and send an email to the user so they can activate their
+     * account and validate their email address. Multisite installs send their own email, so
+     * this is only for single blog installs.
      *
-     * To disable sending activation emails you can user the filter 'bp_core_signup_send_activation_key' and return false.
+     * To disable sending activation emails you can user the filter
+     * 'bp_core_signup_send_activation_key' and return false. Note that this will only disable
+     * the email - a key will still be generated, and the account must still be activated
+     * before use.
      */
-    if ( apply_filters( 'bp_core_signup_send_activation_key', true ) ) {
-        if ( !is_multisite() ) {
-            $activation_key = wp_hash( $user_id );
-            update_user_meta( $user_id, 'activation_key', $activation_key );
+    if ( !is_multisite() ) {
+        $activation_key = wp_hash( $user_id );
+        update_user_meta( $user_id, 'activation_key', $activation_key );
+
+        if ( apply_filters( 'bp_core_signup_send_activation_key', true ) ) {
             bp_core_signup_send_validation_email( $user_id, $user_email, $activation_key );
         }