Changeset 6449 for trunk/bp-members/bp-members-functions.php

Timestamp:

10/22/2012 08:01:56 AM (12 years ago)

Author:

johnjamesjacoby

Message:

Use bp_has_custom_signup_page() in bp_core_wpsignup_redirect() to prevent infinite redirect loops.

File:

• trunk/bp-members/bp-members-functions.php (modified) (2 diffs)

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

@@ -1387 +1387 @@
  */
 function bp_core_wpsignup_redirect() {
+
+    // Bail in admin or if custom signup page is broken
+    if ( is_admin() || ! bp_has_custom_signup_page() )
+        return;
+
     $action = !empty( $_GET['action'] ) ? $_GET['action'] : '';
-
-    if ( is_admin() || is_network_admin() )
-        return;
 
     // Not at the WP core signup page and action is not register
@@ -1396 +1398 @@
         return;
 
-    // Redirect to sign-up page if a custom signup page exists
-    if ( bp_has_custom_signup_page() )
-        bp_core_redirect( bp_get_signup_page() );
+    bp_core_redirect( bp_get_signup_page() );
 }
 add_action( 'bp_init', 'bp_core_wpsignup_redirect' );