Ticket #7873: 7873.patch

src/bp-members/classes/class-bp-members-component.php

@@ -232 +232 @@
                  */
                 if ( bp_displayed_user_has_front_template() ) {
                         $bp->default_component = 'front';
-                } elseif ( defined( 'BP_DEFAULT_COMPONENT' ) && BP_DEFAULT_COMPONENT ) {
-                        $bp->default_component = BP_DEFAULT_COMPONENT;
                 } elseif ( bp_is_active( 'activity' ) && isset( $bp->pages->activity ) ) {
                         $bp->default_component = bp_get_activity_slug();
                 } else {
                         $bp->default_component = ( 'xprofile' === $bp->profile->id ) ? 'profile' : $bp->profile->id;
                 }
 
+                if ( defined( 'BP_DEFAULT_COMPONENT' ) && BP_DEFAULT_COMPONENT ) {
+                        $default_component = BP_DEFAULT_COMPONENT;
+                        if ( 'profile' === $default_component ) {
+                                $default_component = 'xprofile';
+                        }
+
+                        if ( bp_is_active( $default_component ) ) {
+                                $bp->default_component = BP_DEFAULT_COMPONENT;
+                        }
+                }
+
                 /** Canonical Component Stack ****************************************
                  */