Ticket #6178: 6178.3.patch

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

@@ -2291 +2291 @@
                 return;
         }
 
-        $action = !empty( $_GET['action'] ) ? $_GET['action'] : '';
+        $action = '';
+        if ( ! empty( $_GET['action'] ) ) {
+                $action = $_GET['action'];
+        }
+
+        $is_wp_signup = false;
+        if ( ! empty( $_SERVER['SCRIPT_NAME'] ) ) {
+                $script_name_path = wp_parse_url( $_SERVER['SCRIPT_NAME'], PHP_URL_PATH );
+                $is_wp_signup     = ltrim( $script_name_path, '/' ) === 'wp-signup.php';
+        }
+
+        // By default WP Core signup is redirected.
+        $signup_no_redirect = false;
+
+        // Unless the blogs component is not active, adding new sites must be allowed.
+        if ( $is_wp_signup && ! bp_is_active( 'blogs' ) ) {
+                $is_new_site_stage = false;
+                $referer           = wp_get_referer();
+
+                // A new site is being added.
+                if ( isset( $_POST['stage'] ) && $_POST['stage'] === 'gimmeanotherblog' ) {
+                        $signup_no_redirect = true;
+
+                // Check if the user requests a new site.
+                } elseif ( $referer ) {
+                        $referer_path       = wp_parse_url( $referer, PHP_URL_PATH );
+                        $signup_no_redirect = false !== strpos( $referer_path, 'wp-admin/my-sites.php' );
+                }
+        }
 
         // 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 ) ) {
+        if ( ( ! $is_wp_signup || $signup_no_redirect ) && 'register' !== $action ) {
                 return;
         }