Changeset 4440 for trunk/bp-members/bp-members-loader.php

Timestamp:

05/29/2011 05:09:32 PM (15 years ago)

Author:

djpaul

Message:

Fix default_component value when activity component is disabled. Fixes #3182

File:

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

trunk/bp-members/bp-members-loader.php

@@ -124 +124 @@
                 /** Default Profile Component *****************************************/
                 if ( !defined( 'BP_DEFAULT_COMPONENT' ) ) {
-                        if ( isset( $bp->pages->activity ) && isset( $bp->activity->id ) )
+                        if ( bp_is_active( 'activity' ) && isset( $bp->pages->activity ) )
                                 $bp->default_component = $bp->activity->id;
                         else
-                                $bp->default_component = $bp->profile->id;
+                                $bp->default_component = ( 'xprofile' == $bp->profile->id ) ? 'profile' : $bp->profile->id;
+
                 } else {
-                        $bp->default_component     = BP_DEFAULT_COMPONENT;
+                        $bp->default_component = BP_DEFAULT_COMPONENT;
                 }