Changeset 2300

Timestamp:

01/15/2010 11:06:11 AM (15 years ago)

Author:

apeatling

Message:

Fixes #1587

File:

• trunk/bp-core/bp-core-signup.php (modified) (1 diff)

trunk/bp-core/bp-core-signup.php

@@ -245 +245 @@
 /* Kill the wp-signup.php if custom registration signup templates are present */
 function bp_core_wpsignup_redirect() {
-    if ( false === strpos( $_SERVER['SCRIPT_NAME'], 'wp-signup.php') )
+    if ( false === strpos( $_SERVER['SCRIPT_NAME'], 'wp-signup.php') && $_GET['action'] != 'register' )
         return false;
 
     if ( locate_template( array( 'registration/register.php' ), false ) || locate_template( array( 'register.php' ), false ) )
-        wp_redirect( bp_root_domain() . BP_REGISTER_SLUG );
-}
-add_action( 'signup_header', 'bp_core_wpsignup_redirect' );
+        wp_redirect( bp_get_root_domain() . '/' . BP_REGISTER_SLUG );
+}
+if ( bp_core_is_multisite() )
+    add_action( 'wp', 'bp_core_wpsignup_redirect' );
+else
+    add_action( 'init', 'bp_core_wpsignup_redirect' );
+
 ?>