Changeset 4882
- Timestamp:
- 07/28/2011 01:42:30 AM (14 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/bp-core/bp-core-template.php
r4869 r4882 656 656 657 657 if ( !empty( $bp->current_component ) ) { 658 659 658 // First, check to see whether $component_name and the current 660 659 // component are a simple match … … 667 666 $is_current_component = true; 668 667 668 // Because slugs can differ from root_slugs, we should check them too 669 } elseif ( isset( $bp->{$component}->slug ) && $bp->{$component}->slug == $bp->current_component ) { 670 $is_current_component = true; 671 669 672 // Next, check to see whether $component is a canonical, 670 673 // non-translatable component name. If so, we can return its … … 674 677 $is_current_component = true; 675 678 676 // If we haven't found a match yet, check against the root_slugs 677 // created by $bp->pages 679 // If we haven't found a match yet, check against the root_slugs 680 // created by $bp->pages, as well as the regular slugs 678 681 } else { 679 682 foreach ( $bp->active_components as $key => $id ) { -
trunk/bp-members/bp-members-loader.php
r4824 r4882 110 110 if ( !defined( 'BP_DEFAULT_COMPONENT' ) ) { 111 111 if ( bp_is_active( 'activity' ) && isset( $bp->pages->activity ) ) 112 $bp->default_component = $bp->activity->id;112 $bp->default_component = bp_get_activity_slug(); 113 113 else 114 114 $bp->default_component = ( 'xprofile' == $bp->profile->id ) ? 'profile' : $bp->profile->id;
Note: See TracChangeset
for help on using the changeset viewer.