Changeset 12356

Timestamp:

03/11/2019 06:58:06 PM (6 years ago)

Author:

boonebgorges

Message:

Improve wp-login and wp-signup redirects.

This changeset restores the following intended behavior:

1. On non-Multisite, redirect from wp-login.php?action=register to the BP account registration page
2. On Multisite, redirect from wp-signup.php to the BP "Create a Site" page when the wp-signup.php is intended to trigger new site creation and the Blogs component is enabled
3. On Multisite, redirect from wp-signup.php to BP's registration in other cases

Props imath.

Fixes #6178. Fixes #8038.

File:

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

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

@@ -2292 +2292 @@
     }
 
-    $action = !empty( $_GET['action'] ) ? $_GET['action'] : '';
-
-    // Not at the WP core signup page and action is not register.
-    if ( ! empty( $_SERVER['SCRIPT_NAME'] ) && false === strpos( 'wp-signup.php', $_SERVER['SCRIPT_NAME'] ) && ( 'register' != $action ) ) {
+    $is_wp_signup = false;
+    if ( ! empty( $_SERVER['SCRIPT_NAME'] ) ) {
+        $script_name_path = wp_parse_url( $_SERVER['SCRIPT_NAME'], PHP_URL_PATH );
+
+        if ( 'wp-signup.php' === basename( $script_name_path ) || ( 'wp-login.php' === basename( $script_name_path ) && ! empty( $_GET['action'] ) && 'register' === $_GET['action'] ) ) {
+            $is_wp_signup = true;
+        }
+    }
+
+    // If this is not wp-signup.php, there's nothing to do here.
+    if ( ! $is_wp_signup ) {
         return;
     }
 
-    bp_core_redirect( bp_get_signup_page() );
+    /*
+     * We redirect wp-signup.php to the registration page except when it's a site signup.
+     * In that case, redirect to the BP site creation page if available, otherwise allow
+     * access to wp-signup.php.
+     */
+    $redirect_to = bp_get_signup_page();
+
+    $is_site_creation = false;
+
+    $referer = wp_get_referer();
+
+    // A new site is being added.
+    if ( isset( $_POST['stage'] ) && $_POST['stage'] === 'gimmeanotherblog' ) {
+        $is_site_creation = true;
+
+    // We've arrived at wp-signup.php from my-sites.php.
+    } elseif ( $referer ) {
+        $referer_path     = wp_parse_url( $referer, PHP_URL_PATH );
+        $is_site_creation = false !== strpos( $referer_path, 'wp-admin/my-sites.php' );
+    }
+
+    if ( $is_site_creation ) {
+        if ( bp_is_active( 'blogs' ) ) {
+            $redirect_to = trailingslashit( bp_get_blogs_directory_permalink() . 'create' );
+        } else {
+            // Perform no redirect in this case.
+            $redirect_to = '';
+        }
+    }
+
+    if ( ! $redirect_to ) {
+        return;
+    }
+
+    bp_core_redirect( $redirect_to );
 }
 add_action( 'bp_init', 'bp_core_wpsignup_redirect' );