Changeset 9203

Timestamp:

11/28/2014 08:41:07 PM (12 years ago)

Author:

r-a-y

Message:

Signups: Do not bail if no key is found on the activation screen.

r9109 broke how the activation page is rendered if no key is passed in
the URL. For example, if you go to example.com/activate/ instead of
example.com/activate/?key=XXX or example.com/activate/XXX/.

Anti-props r-a-y.

See #5831.

File:

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

trunk/src/bp-members/bp-members-screens.php

@@ -242 +242 @@
     }
 
-    // bail if no key
-    if ( empty( $key ) ) {
-        return;
-    }
-
-    // Activate the signup
-    $user = apply_filters( 'bp_core_activate_account', bp_core_activate_signup( $key ) );
-
-    // If there were errors, add a message and redirect
-    if ( ! empty( $user->errors ) ) {
-        bp_core_add_message( $user->get_error_message(), 'error' );
-        bp_core_redirect( trailingslashit( bp_get_root_domain() . '/' . $bp->pages->activate->slug ) );
-    }
-
-    $hashed_key = wp_hash( $key );
-
-    // Check if the avatar folder exists. If it does, move rename it, move
-    // it and delete the signup avatar dir
-    if ( file_exists( bp_core_avatar_upload_path() . '/avatars/signups/' . $hashed_key ) ) {
-        @rename( bp_core_avatar_upload_path() . '/avatars/signups/' . $hashed_key, bp_core_avatar_upload_path() . '/avatars/' . $user );
-    }
-
-    bp_core_add_message( __( 'Your account is now active!', 'buddypress' ) );
-    $bp->activation_complete = true;
+    // we've got a key; let's attempt to activate the signup
+    if ( ! empty( $key ) ) {
+        // Activate the signup
+        $user = apply_filters( 'bp_core_activate_account', bp_core_activate_signup( $key ) );
+
+        // If there were errors, add a message and redirect
+        if ( ! empty( $user->errors ) ) {
+            bp_core_add_message( $user->get_error_message(), 'error' );
+            bp_core_redirect( trailingslashit( bp_get_root_domain() . '/' . $bp->pages->activate->slug ) );
+        }
+
+        $hashed_key = wp_hash( $key );
+
+        // Check if the signup avatar folder exists. If it does, move the folder to
+        // the BP user avatars directory
+        if ( file_exists( bp_core_avatar_upload_path() . '/avatars/signups/' . $hashed_key ) ) {
+            @rename( bp_core_avatar_upload_path() . '/avatars/signups/' . $hashed_key, bp_core_avatar_upload_path() . '/avatars/' . $user );
+        }
+
+        bp_core_add_message( __( 'Your account is now active!', 'buddypress' ) );
+        $bp->activation_complete = true;
+    }
 
     bp_core_load_template( apply_filters( 'bp_core_template_activate', array( 'activate', 'registration/activate' ) ) );