Changeset 9400 for trunk/src/bp-members/bp-members-screens.php

Timestamp:

01/22/2015 09:44:36 PM (11 years ago)

Author:

johnjamesjacoby

Message:

Review r9109 and r9203, and clean up bp_core_screen_activation() to improve readability and separate a few procedural tasks. Fixes #5831.

File:

• trunk/src/bp-members/bp-members-screens.php (modified) (3 diffs)

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

@@ -290 +290 @@
 /**
  * Handle the loading of the Activate screen.
+ *
+ * @todo Move the actual activation process into an action in bp-members-actions.php
  */
 function bp_core_screen_activation() {
-    global $bp;
-
-    if ( !bp_is_current_component( 'activate' ) )
+    
+    // Bail if not viewing the activation page
+    if ( ! bp_is_current_component( 'activate' ) ) {
         return false;
-
-    // If the user is logged in, redirect away from here
+    }
+
+    // If the user is already logged in, redirect away from here
     if ( is_user_logged_in() ) {
-        if ( bp_is_component_front_page( 'activate' ) ) {
-            $redirect_to = trailingslashit( bp_get_root_domain() . '/' . bp_get_members_root_slug() );
-        } else {
-            $redirect_to = trailingslashit( bp_get_root_domain() );
-        }
+
+        // If activation page is also front page, set to members directory to
+        // avoid an infinite loop. Otherwise, set to root domain.
+        $redirect_to = bp_is_component_front_page( 'activate' )
+            ? bp_get_root_domain() . '/' . bp_get_members_root_slug()
+            : bp_get_root_domain();
+
+        // Trailing slash it, as we expect these URL's to be
+        $redirect_to = trailingslashit( $redirect_to );
 
         /**
@@ -312 +319 @@
          * @param string $redirect_to URL to redirect user to.
          */
-        bp_core_redirect( apply_filters( 'bp_loggedin_activate_page_redirect_to', $redirect_to ) );
-
-        return;
+        $redirect_to = apply_filters( 'bp_loggedin_activate_page_redirect_to', $redirect_to );
+
+        // Redirect away from the activation page
+        bp_core_redirect( $redirect_to );
     }
 
@@ -324 +332 @@
         $key = bp_current_action();
     }
+
+    // Get BuddyPress
+    $bp = buddypress();
 
     // we've got a key; let's attempt to activate the signup